Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / drivers / scsi / mvsas / mv_init.c

diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index b0de3bd..978f528 100644 (file)
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -177,15 +177,16 @@ out:
 
 static irqreturn_t mvs_interrupt(int irq, void *opaque)
 {
-       u32 core_nr;
        u32 stat;
        struct mvs_info *mvi;
        struct sas_ha_struct *sha = opaque;
 #ifndef CONFIG_SCSI_MVSAS_TASKLET
        u32 i;
-#endif
+       u32 core_nr;
 
        core_nr = ((struct mvs_prv_info *)sha->lldd_ha)->n_host;
+#endif
+
        mvi = ((struct mvs_prv_info *)sha->lldd_ha)->mvi[0];
 
        if (unlikely(!mvi))
@@ -299,7 +300,7 @@ err_out:
 
 int mvs_ioremap(struct mvs_info *mvi, int bar, int bar_ex)
 {
-       unsigned long res_start, res_len, res_flag, res_flag_ex = 0;
+       unsigned long res_start, res_len, res_flag_ex = 0;
        struct pci_dev *pdev = mvi->pdev;
        if (bar_ex != -1) {
                /*
@@ -327,7 +328,6 @@ int mvs_ioremap(struct mvs_info *mvi, int bar, int bar_ex)
                goto err_out;
        }
 
-       res_flag = pci_resource_flags(pdev, bar);
        mvi->regs = ioremap(res_start, res_len);
 
        if (!mvi->regs) {