[PATCH] sparse __iomem annotations for qla2xxx

this also found a real bug, qla2xxx isn't iounmapping at host removal at
all currently - and if the right cpp macro would have been set it'd be
too late.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 1d2e3b815bb489ceceebf06e337d43f324f0ba71..dcc33daa5913dbd558d3f3178ae9868698561337 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -36,13 +36,12 @@ qla2300_fw_dump(scsi_qla_host_t *ha, int hardware_locked)
        uint16_t        mb0, mb2;
 
        uint32_t        stat;
-       device_reg_t    *reg;
-       uint16_t        *dmp_reg;
+       device_reg_t __iomem *reg = ha->iobase;
+       uint16_t __iomem *dmp_reg;
        unsigned long   flags;
        struct qla2300_fw_dump  *fw;
        uint32_t        dump_size, data_ram_cnt;
 
-       reg = ha->iobase;
        risc_address = data_ram_cnt = 0;
        mb0 = mb2 = 0;
        flags = 0;
@@ -91,85 +90,85 @@ qla2300_fw_dump(scsi_qla_host_t *ha, int hardware_locked)
        }
 
        if (rval == QLA_SUCCESS) {
-               dmp_reg = (uint16_t *)(reg + 0);
+               dmp_reg = (uint16_t __iomem *)(reg + 0);
                for (cnt = 0; cnt < sizeof(fw->pbiu_reg) / 2; cnt++) 
                        fw->pbiu_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x10);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x10);
                for (cnt = 0; cnt < sizeof(fw->risc_host_reg) / 2; cnt++) 
                        fw->risc_host_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x40);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x40);
                for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++) 
                        fw->mailbox_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->ctrl_status, 0x40);
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->resp_dma_reg) / 2; cnt++) 
                        fw->resp_dma_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->ctrl_status, 0x50);
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->dma_reg) / 2; cnt++) 
                        fw->dma_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->ctrl_status, 0x00);
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0xA0);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0xA0);
                for (cnt = 0; cnt < sizeof(fw->risc_hdw_reg) / 2; cnt++) 
                        fw->risc_hdw_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2000); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp0_reg) / 2; cnt++) 
                        fw->risc_gp0_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2200); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp1_reg) / 2; cnt++) 
                        fw->risc_gp1_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2400); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp2_reg) / 2; cnt++) 
                        fw->risc_gp2_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2600); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp3_reg) / 2; cnt++) 
                        fw->risc_gp3_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2800); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp4_reg) / 2; cnt++) 
                        fw->risc_gp4_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2A00); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp5_reg) / 2; cnt++) 
                        fw->risc_gp5_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2C00); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp6_reg) / 2; cnt++) 
                        fw->risc_gp6_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2E00); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp7_reg) / 2; cnt++) 
                        fw->risc_gp7_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->ctrl_status, 0x10); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->frame_buf_hdw_reg) / 2; cnt++) 
                        fw->frame_buf_hdw_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->ctrl_status, 0x20); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->fpm_b0_reg) / 2; cnt++) 
                        fw->fpm_b0_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->ctrl_status, 0x30); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->fpm_b1_reg) / 2; cnt++) 
                        fw->fpm_b1_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
@@ -588,13 +587,11 @@ qla2100_fw_dump(scsi_qla_host_t *ha, int hardware_locked)
        uint32_t        cnt, timer;
        uint16_t        risc_address;
        uint16_t        mb0, mb2;
-
-       device_reg_t    *reg;
-       uint16_t        *dmp_reg;
+       device_reg_t __iomem *reg = ha->iobase;
+       uint16_t __iomem *dmp_reg;
        unsigned long   flags;
        struct qla2100_fw_dump  *fw;
 
-       reg = ha->iobase;
        risc_address = 0;
        mb0 = mb2 = 0;
        flags = 0;
@@ -634,79 +631,79 @@ qla2100_fw_dump(scsi_qla_host_t *ha, int hardware_locked)
                        rval = QLA_FUNCTION_TIMEOUT;
        }
        if (rval == QLA_SUCCESS) {
-               dmp_reg = (uint16_t *)(reg + 0);
+               dmp_reg = (uint16_t __iomem *)(reg + 0);
                for (cnt = 0; cnt < sizeof(fw->pbiu_reg) / 2; cnt++) 
                        fw->pbiu_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x10);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x10);
                for (cnt = 0; cnt < ha->mbx_count; cnt++) {
                        if (cnt == 8) {
-                               dmp_reg = (uint16_t *)((uint8_t *)reg + 0xe0);
+                               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0xe0);
                        }
                        fw->mailbox_reg[cnt] = RD_REG_WORD(dmp_reg++);
                }
 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x20);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x20);
                for (cnt = 0; cnt < sizeof(fw->dma_reg) / 2; cnt++) 
                        fw->dma_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->ctrl_status, 0x00);
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0xA0);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0xA0);
                for (cnt = 0; cnt < sizeof(fw->risc_hdw_reg) / 2; cnt++) 
                        fw->risc_hdw_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2000); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp0_reg) / 2; cnt++) 
                        fw->risc_gp0_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2100); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp1_reg) / 2; cnt++) 
                        fw->risc_gp1_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2200); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp2_reg) / 2; cnt++) 
                        fw->risc_gp2_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2300); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp3_reg) / 2; cnt++) 
                        fw->risc_gp3_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2400); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp4_reg) / 2; cnt++) 
                        fw->risc_gp4_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2500); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp5_reg) / 2; cnt++) 
                        fw->risc_gp5_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2600); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp6_reg) / 2; cnt++) 
                        fw->risc_gp6_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->pcr, 0x2700); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->risc_gp7_reg) / 2; cnt++) 
                        fw->risc_gp7_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->ctrl_status, 0x10); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->frame_buf_hdw_reg) / 2; cnt++) 
                        fw->frame_buf_hdw_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->ctrl_status, 0x20); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->fpm_b0_reg) / 2; cnt++) 
                        fw->fpm_b0_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
                WRT_REG_WORD(&reg->ctrl_status, 0x30); 
-               dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
+               dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);
                for (cnt = 0; cnt < sizeof(fw->fpm_b1_reg) / 2; cnt++) 
                        fw->fpm_b1_reg[cnt] = RD_REG_WORD(dmp_reg++);
 
@@ -987,9 +984,7 @@ qla_uprintf(char **uiter, char *fmt, ...)
 void 
 qla2x00_dump_regs(scsi_qla_host_t *ha) 
 {
-       device_reg_t    *reg;
-
-       reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
 
        printk("Mailbox registers:\n");
        printk("scsi(%ld): mbox 0 0x%04x \n",

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 64cf94c4a241328e5484ee2fa9f773b90aa2443c..6c94b8667fcd51289f4081b944bc049433d0ee9f 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2126,11 +2126,9 @@ typedef struct scsi_qla_host {
 
        spinlock_t              hardware_lock ____cacheline_aligned;
 
-       device_reg_t    *iobase;                /* Base I/O address */
+       device_reg_t __iomem *iobase;           /* Base I/O address */
        unsigned long   pio_address;
        unsigned long   pio_length;
-       void *          mmio_address;
-       unsigned long   mmio_length;
 #define MIN_IOBASE_LEN         0x100
 
        /* ISP ring lock, rings, and indexes */

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 118117447166fd4327d8823df45e6156e93d4ed5..aa6e8103df7311f6d6e171d5b2aeb990dc34116f 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -385,7 +385,7 @@ static void
 qla2x00_reset_chip(scsi_qla_host_t *ha) 
 {
        unsigned long   flags = 0;
-       device_reg_t    *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
        uint32_t        cnt;
        unsigned long   mbx_flags = 0;
        uint16_t        cmd;
@@ -539,7 +539,7 @@ static int
 qla2x00_chip_diag(scsi_qla_host_t *ha)
 {
        int             rval;
-       device_reg_t    *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
        unsigned long   flags = 0;
        uint16_t        data;
        uint32_t        cnt;
@@ -905,7 +905,7 @@ qla2x00_init_rings(scsi_qla_host_t *ha)
        int     rval;
        unsigned long flags = 0;
        int cnt;
-       device_reg_t *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
 
        spin_lock_irqsave(&ha->hardware_lock, flags);
 
@@ -1192,7 +1192,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
        init_cb_t *icb   = ha->init_cb;
        nvram_t *nv    = (nvram_t *)ha->request_ring;
        uint16_t  *wptr  = (uint16_t *)ha->request_ring;
-       device_reg_t *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
        uint8_t  timer_mode;
 
        rval = QLA_SUCCESS;
@@ -4271,7 +4271,7 @@ static int
 qla2x00_restart_isp(scsi_qla_host_t *ha)
 {
        uint8_t         status = 0;
-       device_reg_t    *reg;
+       device_reg_t __iomem *reg = ha->iobase;
        unsigned long   flags = 0;
        uint32_t wait_time;
 
@@ -4356,7 +4356,7 @@ static void
 qla2x00_reset_adapter(scsi_qla_host_t *ha)
 {
        unsigned long flags = 0;
-       device_reg_t *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
 
        ha->flags.online = 0;
        qla2x00_disable_intrs(ha);

diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
index a88f34a14e0dddbfc61fa03939cfcc6ecd26ef6e..07c11330f9a3e1ca94c45ab8ad44339d066df477 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_inline.h
+++ b/drivers/scsi/qla2xxx/qla_inline.h
@@ -18,7 +18,7 @@
  */
 
 
-static __inline__ uint16_t qla2x00_debounce_register(volatile uint16_t *);
+static __inline__ uint16_t qla2x00_debounce_register(volatile uint16_t __iomem *);
 /*
  * qla2x00_debounce_register
  *      Debounce register.
@@ -30,7 +30,7 @@ static __inline__ uint16_t qla2x00_debounce_register(volatile uint16_t *);
  *      register value.
  */
 static __inline__ uint16_t
-qla2x00_debounce_register(volatile uint16_t *addr) 
+qla2x00_debounce_register(volatile uint16_t __iomem *addr) 
 {
        volatile uint16_t first;
        volatile uint16_t second;
@@ -131,10 +131,9 @@ static inline void
 qla2x00_enable_intrs(scsi_qla_host_t *ha)
 {
        unsigned long flags = 0;
-       device_reg_t *reg;
+       device_reg_t __iomem *reg = ha->iobase;
 
        spin_lock_irqsave(&ha->hardware_lock, flags);
-       reg = ha->iobase;
        ha->interrupts_on = 1;
        /* enable risc and host interrupts */
        WRT_REG_WORD(&reg->ictrl, ICR_EN_INT | ICR_EN_RISC);
@@ -147,10 +146,9 @@ static inline void
 qla2x00_disable_intrs(scsi_qla_host_t *ha)
 {
        unsigned long flags = 0;
-       device_reg_t *reg;
+       device_reg_t __iomem *reg = ha->iobase;
 
        spin_lock_irqsave(&ha->hardware_lock, flags);
-       reg = ha->iobase;
        ha->interrupts_on = 0;
        /* disable risc and host interrupts */
        WRT_REG_WORD(&reg->ictrl, 0);

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 7013489be66c7cd30d2569875487e39279d96205..ed3f9413a4d717ae3bc16353e3d5275371cb9bfe 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -338,15 +338,15 @@ qla2x00_start_scsi(srb_t *sp)
        uint16_t        cnt;
        uint16_t        req_cnt;
        uint16_t        tot_dsds;
-       device_reg_t    *reg;
+       device_reg_t __iomem *reg;
        char            tag[2];
 
        /* Setup device pointers. */
        ret = 0;
        fclun = sp->lun_queue->fclun;
        ha = fclun->fcport->ha;
-       cmd = sp->cmd;
        reg = ha->iobase;
+       cmd = sp->cmd;
 
        /* Send marker if required */
        if (ha->marker_needed != 0) {
@@ -547,7 +547,7 @@ qla2x00_marker(scsi_qla_host_t *ha, uint16_t loop_id, uint16_t lun,
 request_t *
 qla2x00_req_pkt(scsi_qla_host_t *ha)
 {
-       device_reg_t    *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
        request_t       *pkt = NULL;
        uint16_t        cnt;
        uint32_t        *dword_ptr;
@@ -616,7 +616,7 @@ qla2x00_req_pkt(scsi_qla_host_t *ha)
 request_t *
 qla2x00_ms_req_pkt(scsi_qla_host_t *ha, srb_t  *sp)
 {
-       device_reg_t    *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
        request_t       *pkt = NULL;
        uint16_t        cnt, i, index;
        uint32_t        *dword_ptr;
@@ -706,7 +706,7 @@ qla2x00_ms_req_pkt(scsi_qla_host_t *ha, srb_t  *sp)
 void
 qla2x00_isp_cmd(scsi_qla_host_t *ha)
 {
-       device_reg_t *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
 
        DEBUG5(printk("%s(): IOCB data:\n", __func__));
        DEBUG5(qla2x00_dump_buffer(

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 77b72b082306b38ce24e336cafa278b4e30c09c5..4e14009fd48f43012fd09da60b028591f174025d 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -43,7 +43,7 @@ irqreturn_t
 qla2100_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
 {
        scsi_qla_host_t *ha;
-       device_reg_t    *reg;
+       device_reg_t __iomem *reg;
        int             status;
        unsigned long   flags;
        unsigned long   iter;
@@ -127,7 +127,7 @@ irqreturn_t
 qla2300_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
 {
        scsi_qla_host_t *ha;
-       device_reg_t    *reg;
+       device_reg_t __iomem *reg;
        int             status;
        unsigned long   flags;
        unsigned long   iter;
@@ -235,17 +235,17 @@ static void
 qla2x00_mbx_completion(scsi_qla_host_t *ha, uint16_t mb0)
 {
        uint16_t        cnt;
-       uint16_t        *wptr;
-       device_reg_t    *reg = ha->iobase;
+       uint16_t __iomem *wptr;
+       device_reg_t __iomem *reg = ha->iobase;
 
        /* Load return mailbox registers. */
        ha->flags.mbox_int = 1;
        ha->mailbox_out[0] = mb0;
-       wptr = (uint16_t *)MAILBOX_REG(ha, reg, 1);
+       wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 1);
 
        for (cnt = 1; cnt < ha->mbx_count; cnt++) {
                if (IS_QLA2200(ha) && cnt == 8) 
-                       wptr = (uint16_t *)MAILBOX_REG(ha, reg, 8);
+                       wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 8);
                if (cnt == 4 || cnt == 5)
                        ha->mailbox_out[cnt] = qla2x00_debounce_register(wptr);
                else
@@ -277,7 +277,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint32_t mbx)
        uint16_t        handle_cnt;
        uint16_t        cnt;
        uint32_t        handles[5];
-       device_reg_t    *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
        uint32_t        rscn_entry, host_pid;
        uint8_t         rscn_queue_index;
 
@@ -724,7 +724,7 @@ qla2x00_process_completed_request(struct scsi_qla_host *ha, uint32_t index)
 void
 qla2x00_process_response_queue(struct scsi_qla_host *ha)
 {
-       device_reg_t    *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
        sts_entry_t     *pkt;
        uint16_t        handle_cnt;
        uint16_t        cnt;

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 96d1e00361b7d8e5535ef1705c8a8020b56f1398..db3854123ee541c709ba1d33105503650b9bc31c 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -58,12 +58,13 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
 {
        int             rval;
        unsigned long    flags = 0;
-       device_reg_t     *reg       = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
        struct timer_list       tmp_intr_timer;
        uint8_t         abort_active = test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags);
        uint8_t         io_lock_on = ha->flags.init_done;
        uint16_t        command;
-       uint16_t        *iptr, *optr;
+       uint16_t        *iptr;
+       uint16_t __iomem *optr;
        uint32_t        cnt;
        uint32_t        mboxes;
        unsigned long   mbx_flags = 0;
@@ -101,7 +102,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
        spin_lock_irqsave(&ha->hardware_lock, flags);
 
        /* Load mailbox registers. */
-       optr = (uint16_t *)MAILBOX_REG(ha, reg, 0);
+       optr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 0);
 
        iptr = mcp->mb;
        command = mcp->mb[0];
@@ -109,7 +110,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
 
        for (cnt = 0; cnt < ha->mbx_count; cnt++) {
                if (IS_QLA2200(ha) && cnt == 8)
-                       optr = (uint16_t *)MAILBOX_REG(ha, reg, 8);
+                       optr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 8);
                if (mboxes & BIT_0)
                        WRT_REG_WORD(optr, *iptr);
 
@@ -209,6 +210,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
 
        /* Check whether we timed out */
        if (ha->flags.mbox_int) {
+               uint16_t *iptr2;
 
                DEBUG3_11(printk("qla2x00_mailbox_cmd: cmd %x completed.\n",
                    command);)
@@ -223,15 +225,15 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
                }
 
                /* Load return mailbox registers. */
-               optr = mcp->mb;
+               iptr2 = mcp->mb;
                iptr = (uint16_t *)&ha->mailbox_out[0];
                mboxes = mcp->in_mb;
                for (cnt = 0; cnt < ha->mbx_count; cnt++) {
                        if (mboxes & BIT_0)
-                               *optr = *iptr;
+                               *iptr2 = *iptr;
 
                        mboxes >>= 1;
-                       optr++;
+                       iptr2++;
                        iptr++;
                }
        } else {

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 4d27495f958f44d920c3a1a4a2601abfe4c11cd8..24eb6fe3b9096682a2407a7fa4069730937d185e 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -845,11 +845,9 @@ qla2x00_queuecommand(struct scsi_cmnd *cmd, void (*fn)(struct scsi_cmnd *))
                was_empty = add_to_pending_queue(ha, sp);
 
        if ((IS_QLA2100(ha) || IS_QLA2200(ha)) && ha->flags.online) {
-               unsigned long flags;
-               device_reg_t *reg;
-               reg = ha->iobase;
-               
                if (ha->response_ring_ptr->signature != RESPONSE_PROCESSED) {
+                       unsigned long flags;
+
                        spin_lock_irqsave(&ha->hardware_lock, flags);   
                        qla2x00_process_response_queue(ha);
                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
@@ -1890,15 +1888,13 @@ qla2x00_iospace_config(scsi_qla_host_t *ha)
 
        ha->pio_address = pio;
        ha->pio_length = pio_len;
-       ha->mmio_address = ioremap(mmio, MIN_IOBASE_LEN);
-       if (!ha->mmio_address) {
+       ha->iobase = ioremap(mmio, MIN_IOBASE_LEN);
+       if (!ha->iobase) {
                qla_printk(KERN_ERR, ha,
                    "cannot remap MMIO (%s), aborting\n", ha->pdev->slot_name);
 
                goto iospace_error_exit;
        }
-       ha->mmio_length = mmio_len;
-       ha->iobase = (device_reg_t *) ha->mmio_address;
 
        return (0);
 
@@ -1912,7 +1908,7 @@ iospace_error_exit:
 int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
 {
        int     ret;
-       device_reg_t *reg;
+       device_reg_t __iomem *reg;
        struct Scsi_Host *host;
        scsi_qla_host_t *ha;
        unsigned long   flags = 0;
@@ -2225,14 +2221,11 @@ qla2x00_free_device(scsi_qla_host_t *ha)
                free_irq(ha->pdev->irq, ha);
 
        /* release io space registers  */
+       if (ha->iobase)
+               iounmap(ha->iobase);
        pci_release_regions(ha->pdev);
 
        pci_disable_device(ha->pdev);
-
-#if MEMORY_MAPPED_IO
-       if (ha->mmio_address)
-               iounmap(ha->mmio_address);
-#endif
 }
 
 

diff --git a/drivers/scsi/qla2xxx/qla_rscn.c b/drivers/scsi/qla2xxx/qla_rscn.c
index 488d3c685bc8e566c02a6e24843386bc3022ad5e..26d6d384355eb2694445afa0e8868f9b6345d408 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_rscn.c
+++ b/drivers/scsi/qla2xxx/qla_rscn.c
@@ -374,10 +374,9 @@ static inline struct mbx_entry *
 qla2x00_get_mbx_iocb_entry(scsi_qla_host_t *ha, uint32_t handle)
 {
        uint16_t cnt;
-       device_reg_t *reg;
+       device_reg_t __iomem *reg = ha->iobase;
        struct mbx_entry *mbxentry;
 
-       reg = ha->iobase;
        mbxentry = NULL;
 
        if (ha->req_q_cnt < 3) {

diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 46181b1b0c7d5daf31c01b70acb8b00b1a7065a2..203c23dfa27517cef3ea65d4f4c81755c3e4ce1c 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -39,9 +39,7 @@ void
 qla2x00_lock_nvram_access(scsi_qla_host_t *ha)
 {
        uint16_t data;
-       device_reg_t *reg;
-
-       reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
 
        if (!IS_QLA2100(ha) && !IS_QLA2200(ha) && !IS_QLA2300(ha)) {
                data = RD_REG_WORD(&reg->nvram);
@@ -73,9 +71,7 @@ qla2x00_lock_nvram_access(scsi_qla_host_t *ha)
 void
 qla2x00_unlock_nvram_access(scsi_qla_host_t *ha)
 {
-       device_reg_t *reg;
-
-       reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
 
        if (!IS_QLA2100(ha) && !IS_QLA2200(ha) && !IS_QLA2300(ha)) {
                WRT_REG_WORD(&reg->u.isp2300.host_semaphore, 0);
@@ -116,7 +112,7 @@ qla2x00_write_nvram_word(scsi_qla_host_t *ha, uint32_t addr, uint16_t data)
        int count;
        uint16_t word;
        uint32_t nv_cmd;
-       device_reg_t *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
 
        qla2x00_nv_write(ha, NVR_DATA_OUT);
        qla2x00_nv_write(ha, 0);
@@ -201,7 +197,7 @@ static uint16_t
 qla2x00_nvram_request(scsi_qla_host_t *ha, uint32_t nv_cmd)
 {
        uint8_t         cnt;
-       device_reg_t    *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
        uint16_t        data = 0;
        uint16_t        reg_data;
 
@@ -243,7 +239,7 @@ qla2x00_nvram_request(scsi_qla_host_t *ha, uint32_t nv_cmd)
 void
 qla2x00_nv_deselect(scsi_qla_host_t *ha)
 {
-       device_reg_t *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
 
        WRT_REG_WORD(&reg->nvram, NVR_DESELECT);
        NVRAM_DELAY();
@@ -258,7 +254,7 @@ qla2x00_nv_deselect(scsi_qla_host_t *ha)
 void
 qla2x00_nv_write(scsi_qla_host_t *ha, uint16_t data)
 {
-       device_reg_t *reg = ha->iobase;
+       device_reg_t __iomem *reg = ha->iobase;
 
        WRT_REG_WORD(&reg->nvram, data | NVR_SELECT);
        NVRAM_DELAY();