qla2xxx: Avoid side effects when using endianizer macros.

Orabug: 22863553

Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Dan Duval <dan.duval@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index e19e0fe5f5a79edcf3140715cd7050079a318d8c..d847a38e9ab65d50a656ac5726c066c3103308ba 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -272,8 +272,8 @@ qla2x00_sysfs_write_nvram(struct file *filp, struct kobject *kobj,
 
                iter = (uint32_t *)buf;
                chksum = 0;
-               for (cnt = 0; cnt < ((count >> 2) - 1); cnt++)
-                       chksum += le32_to_cpu(*iter++);
+               for (cnt = 0; cnt < ((count >> 2) - 1); cnt++, iter++)
+                       chksum += le32_to_cpu(*iter);
                chksum = ~chksum + 1;
                *iter = cpu_to_le32(chksum);
        } else {

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index d6c11d61aadc4b8463b69b42fa9315df7b312d28..da38e54a6da3230f3db9878f568344f92b255069 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -298,8 +298,8 @@ qla24xx_read_window(struct device_reg_24xx __iomem *reg, uint32_t iobase,
 
        WRT_REG_DWORD(&reg->iobase_addr, iobase);
        dmp_reg = &reg->iobase_window;
-       while (count--)
-               *buf++ = htonl(RD_REG_DWORD(dmp_reg++));
+       for ( ; count--; dmp_reg++)
+               *buf++ = htonl(RD_REG_DWORD(dmp_reg));
 
        return buf;
 }
@@ -461,8 +461,8 @@ qla2xxx_read_window(struct device_reg_2xxx __iomem *reg, uint32_t count,
 {
        uint16_t __iomem *dmp_reg = &reg->u.isp2300.fb_cmd;
 
-       while (count--)
-               *buf++ = htons(RD_REG_WORD(dmp_reg++));
+       for ( ; count--; dmp_reg++)
+               *buf++ = htons(RD_REG_WORD(dmp_reg));
 }
 
 static inline void *
@@ -735,16 +735,18 @@ qla2300_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
 
        if (rval == QLA_SUCCESS) {
                dmp_reg = &reg->flash_address;
-               for (cnt = 0; cnt < sizeof(fw->pbiu_reg) / 2; cnt++)
-                       fw->pbiu_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));
+               for (cnt = 0; cnt < sizeof(fw->pbiu_reg) / 2; cnt++, dmp_reg++)
+                       fw->pbiu_reg[cnt] = htons(RD_REG_WORD(dmp_reg));
 
                dmp_reg = &reg->u.isp2300.req_q_in;
-               for (cnt = 0; cnt < sizeof(fw->risc_host_reg) / 2; cnt++)
-                       fw->risc_host_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));
+               for (cnt = 0; cnt < sizeof(fw->risc_host_reg) / 2;
+                   cnt++, dmp_reg++)
+                       fw->risc_host_reg[cnt] = htons(RD_REG_WORD(dmp_reg));
 
                dmp_reg = &reg->u.isp2300.mailbox0;
-               for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++)
-                       fw->mailbox_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));
+               for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2;
+                   cnt++, dmp_reg++)
+                       fw->mailbox_reg[cnt] = htons(RD_REG_WORD(dmp_reg));
 
                WRT_REG_WORD(&reg->ctrl_status, 0x40);
                qla2xxx_read_window(reg, 32, fw->resp_dma_reg);
@@ -754,8 +756,9 @@ qla2300_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
 
                WRT_REG_WORD(&reg->ctrl_status, 0x00);
                dmp_reg = &reg->risc_hw;
-               for (cnt = 0; cnt < sizeof(fw->risc_hdw_reg) / 2; cnt++)
-                       fw->risc_hdw_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));
+               for (cnt = 0; cnt < sizeof(fw->risc_hdw_reg) / 2;
+                   cnt++, dmp_reg++)
+                       fw->risc_hdw_reg[cnt] = htons(RD_REG_WORD(dmp_reg));
 
                WRT_REG_WORD(&reg->pcr, 0x2000);
                qla2xxx_read_window(reg, 16, fw->risc_gp0_reg);
@@ -892,25 +895,25 @@ qla2100_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
        }
        if (rval == QLA_SUCCESS) {
                dmp_reg = &reg->flash_address;
-               for (cnt = 0; cnt < sizeof(fw->pbiu_reg) / 2; cnt++)
-                       fw->pbiu_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));
+               for (cnt = 0; cnt < sizeof(fw->pbiu_reg) / 2; cnt++, dmp_reg++)
+                       fw->pbiu_reg[cnt] = htons(RD_REG_WORD(dmp_reg));
 
                dmp_reg = &reg->u.isp2100.mailbox0;
-               for (cnt = 0; cnt < ha->mbx_count; cnt++) {
+               for (cnt = 0; cnt < ha->mbx_count; cnt++, dmp_reg++) {
                        if (cnt == 8)
                                dmp_reg = &reg->u_end.isp2200.mailbox8;
 
-                       fw->mailbox_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));
+                       fw->mailbox_reg[cnt] = htons(RD_REG_WORD(dmp_reg));
                }
 
                dmp_reg = &reg->u.isp2100.unused_2[0];
-               for (cnt = 0; cnt < sizeof(fw->dma_reg) / 2; cnt++)
-                       fw->dma_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));
+               for (cnt = 0; cnt < sizeof(fw->dma_reg) / 2; cnt++, dmp_reg++)
+                       fw->dma_reg[cnt] = htons(RD_REG_WORD(dmp_reg));
 
                WRT_REG_WORD(&reg->ctrl_status, 0x00);
                dmp_reg = &reg->risc_hw;
-               for (cnt = 0; cnt < sizeof(fw->risc_hdw_reg) / 2; cnt++)
-                       fw->risc_hdw_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));
+               for (cnt = 0; cnt < sizeof(fw->risc_hdw_reg) / 2; cnt++, dmp_reg++)
+                       fw->risc_hdw_reg[cnt] = htons(RD_REG_WORD(dmp_reg));
 
                WRT_REG_WORD(&reg->pcr, 0x2000);
                qla2xxx_read_window(reg, 16, fw->risc_gp0_reg);
@@ -1086,8 +1089,8 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
 
        /* Host interface registers. */
        dmp_reg = &reg->flash_addr;
-       for (cnt = 0; cnt < sizeof(fw->host_reg) / 4; cnt++)
-               fw->host_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < sizeof(fw->host_reg) / 4; cnt++, dmp_reg++)
+               fw->host_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg));
 
        /* Disable interrupts. */
        WRT_REG_DWORD(&reg->ictrl, 0);
@@ -1119,8 +1122,8 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
 
        /* Mailbox registers. */
        mbx_reg = &reg->mailbox0;
-       for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++)
-               fw->mailbox_reg[cnt] = htons(RD_REG_WORD(mbx_reg++));
+       for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++, dmp_reg++)
+               fw->mailbox_reg[cnt] = htons(RD_REG_WORD(mbx_reg));
 
        /* Transfer sequence registers. */
        iter_reg = fw->xseq_gp_reg;
@@ -1158,20 +1161,20 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
        iter_reg = fw->req0_dma_reg;
        iter_reg = qla24xx_read_window(reg, 0x7200, 8, iter_reg);
        dmp_reg = &reg->iobase_q;
-       for (cnt = 0; cnt < 7; cnt++)
-               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < 7; cnt++, dmp_reg++)
+               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg));
 
        iter_reg = fw->resp0_dma_reg;
        iter_reg = qla24xx_read_window(reg, 0x7300, 8, iter_reg);
        dmp_reg = &reg->iobase_q;
-       for (cnt = 0; cnt < 7; cnt++)
-               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < 7; cnt++, dmp_reg++)
+               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg));
 
        iter_reg = fw->req1_dma_reg;
        iter_reg = qla24xx_read_window(reg, 0x7400, 8, iter_reg);
        dmp_reg = &reg->iobase_q;
-       for (cnt = 0; cnt < 7; cnt++)
-               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < 7; cnt++, dmp_reg++)
+               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg));
 
        /* Transmit DMA registers. */
        iter_reg = fw->xmt0_dma_reg;
@@ -1343,8 +1346,10 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
        RD_REG_DWORD(&reg->iobase_addr);
        WRT_REG_DWORD(&reg->iobase_window, 0x01);
        dmp_reg = &reg->iobase_c4;
-       fw->pcie_regs[0] = htonl(RD_REG_DWORD(dmp_reg++));
-       fw->pcie_regs[1] = htonl(RD_REG_DWORD(dmp_reg++));
+       fw->pcie_regs[0] = htonl(RD_REG_DWORD(dmp_reg));
+       dmp_reg++;
+       fw->pcie_regs[1] = htonl(RD_REG_DWORD(dmp_reg));
+       dmp_reg++;
        fw->pcie_regs[2] = htonl(RD_REG_DWORD(dmp_reg));
        fw->pcie_regs[3] = htonl(RD_REG_DWORD(&reg->iobase_window));
 
@@ -1353,8 +1358,8 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
 
        /* Host interface registers. */
        dmp_reg = &reg->flash_addr;
-       for (cnt = 0; cnt < sizeof(fw->host_reg) / 4; cnt++)
-               fw->host_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < sizeof(fw->host_reg) / 4; cnt++, dmp_reg++)
+               fw->host_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg));
 
        /* Disable interrupts. */
        WRT_REG_DWORD(&reg->ictrl, 0);
@@ -1402,8 +1407,8 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
 
        /* Mailbox registers. */
        mbx_reg = &reg->mailbox0;
-       for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++)
-               fw->mailbox_reg[cnt] = htons(RD_REG_WORD(mbx_reg++));
+       for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++, mbx_reg++)
+               fw->mailbox_reg[cnt] = htons(RD_REG_WORD(mbx_reg));
 
        /* Transfer sequence registers. */
        iter_reg = fw->xseq_gp_reg;
@@ -1466,20 +1471,20 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
        iter_reg = fw->req0_dma_reg;
        iter_reg = qla24xx_read_window(reg, 0x7200, 8, iter_reg);
        dmp_reg = &reg->iobase_q;
-       for (cnt = 0; cnt < 7; cnt++)
-               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < 7; cnt++, dmp_reg++)
+               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg));
 
        iter_reg = fw->resp0_dma_reg;
        iter_reg = qla24xx_read_window(reg, 0x7300, 8, iter_reg);
        dmp_reg = &reg->iobase_q;
-       for (cnt = 0; cnt < 7; cnt++)
-               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < 7; cnt++, dmp_reg++)
+               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg));
 
        iter_reg = fw->req1_dma_reg;
        iter_reg = qla24xx_read_window(reg, 0x7400, 8, iter_reg);
        dmp_reg = &reg->iobase_q;
-       for (cnt = 0; cnt < 7; cnt++)
-               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < 7; cnt++, dmp_reg++)
+               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg));
 
        /* Transmit DMA registers. */
        iter_reg = fw->xmt0_dma_reg;
@@ -1658,8 +1663,10 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
        RD_REG_DWORD(&reg->iobase_addr);
        WRT_REG_DWORD(&reg->iobase_window, 0x01);
        dmp_reg = &reg->iobase_c4;
-       fw->pcie_regs[0] = htonl(RD_REG_DWORD(dmp_reg++));
-       fw->pcie_regs[1] = htonl(RD_REG_DWORD(dmp_reg++));
+       fw->pcie_regs[0] = htonl(RD_REG_DWORD(dmp_reg));
+       dmp_reg++;
+       fw->pcie_regs[1] = htonl(RD_REG_DWORD(dmp_reg));
+       dmp_reg++;
        fw->pcie_regs[2] = htonl(RD_REG_DWORD(dmp_reg));
        fw->pcie_regs[3] = htonl(RD_REG_DWORD(&reg->iobase_window));
 
@@ -1668,8 +1675,8 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
 
        /* Host interface registers. */
        dmp_reg = &reg->flash_addr;
-       for (cnt = 0; cnt < sizeof(fw->host_reg) / 4; cnt++)
-               fw->host_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < sizeof(fw->host_reg) / 4; cnt++, dmp_reg++)
+               fw->host_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg));
 
        /* Disable interrupts. */
        WRT_REG_DWORD(&reg->ictrl, 0);
@@ -1717,8 +1724,8 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
 
        /* Mailbox registers. */
        mbx_reg = &reg->mailbox0;
-       for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++)
-               fw->mailbox_reg[cnt] = htons(RD_REG_WORD(mbx_reg++));
+       for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++, mbx_reg++)
+               fw->mailbox_reg[cnt] = htons(RD_REG_WORD(mbx_reg));
 
        /* Transfer sequence registers. */
        iter_reg = fw->xseq_gp_reg;
@@ -1781,20 +1788,20 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
        iter_reg = fw->req0_dma_reg;
        iter_reg = qla24xx_read_window(reg, 0x7200, 8, iter_reg);
        dmp_reg = &reg->iobase_q;
-       for (cnt = 0; cnt < 7; cnt++)
-               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < 7; cnt++, dmp_reg++)
+               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg));
 
        iter_reg = fw->resp0_dma_reg;
        iter_reg = qla24xx_read_window(reg, 0x7300, 8, iter_reg);
        dmp_reg = &reg->iobase_q;
-       for (cnt = 0; cnt < 7; cnt++)
-               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < 7; cnt++, dmp_reg++)
+               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg));
 
        iter_reg = fw->req1_dma_reg;
        iter_reg = qla24xx_read_window(reg, 0x7400, 8, iter_reg);
        dmp_reg = &reg->iobase_q;
-       for (cnt = 0; cnt < 7; cnt++)
-               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < 7; cnt++, dmp_reg++)
+               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg));
 
        /* Transmit DMA registers. */
        iter_reg = fw->xmt0_dma_reg;
@@ -1995,8 +2002,10 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
        RD_REG_DWORD(&reg->iobase_addr);
        WRT_REG_DWORD(&reg->iobase_window, 0x01);
        dmp_reg = &reg->iobase_c4;
-       fw->pcie_regs[0] = htonl(RD_REG_DWORD(dmp_reg++));
-       fw->pcie_regs[1] = htonl(RD_REG_DWORD(dmp_reg++));
+       fw->pcie_regs[0] = htonl(RD_REG_DWORD(dmp_reg));
+       dmp_reg++;
+       fw->pcie_regs[1] = htonl(RD_REG_DWORD(dmp_reg));
+       dmp_reg++;
        fw->pcie_regs[2] = htonl(RD_REG_DWORD(dmp_reg));
        fw->pcie_regs[3] = htonl(RD_REG_DWORD(&reg->iobase_window));
 
@@ -2005,8 +2014,8 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
 
        /* Host interface registers. */
        dmp_reg = &reg->flash_addr;
-       for (cnt = 0; cnt < sizeof(fw->host_reg) / 4; cnt++)
-               fw->host_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < sizeof(fw->host_reg) / 4; cnt++, dmp_reg++)
+               fw->host_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg));
 
        /* Disable interrupts. */
        WRT_REG_DWORD(&reg->ictrl, 0);
@@ -2054,8 +2063,8 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
 
        /* Mailbox registers. */
        mbx_reg = &reg->mailbox0;
-       for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++)
-               fw->mailbox_reg[cnt] = htons(RD_REG_WORD(mbx_reg++));
+       for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++, dmp_reg++)
+               fw->mailbox_reg[cnt] = htons(RD_REG_WORD(mbx_reg));
 
        /* Transfer sequence registers. */
        iter_reg = fw->xseq_gp_reg;
@@ -2150,20 +2159,20 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
        iter_reg = fw->req0_dma_reg;
        iter_reg = qla24xx_read_window(reg, 0x7200, 8, iter_reg);
        dmp_reg = &reg->iobase_q;
-       for (cnt = 0; cnt < 7; cnt++)
-               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < 7; cnt++, dmp_reg++)
+               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg));
 
        iter_reg = fw->resp0_dma_reg;
        iter_reg = qla24xx_read_window(reg, 0x7300, 8, iter_reg);
        dmp_reg = &reg->iobase_q;
-       for (cnt = 0; cnt < 7; cnt++)
-               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < 7; cnt++, dmp_reg++)
+               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg));
 
        iter_reg = fw->req1_dma_reg;
        iter_reg = qla24xx_read_window(reg, 0x7400, 8, iter_reg);
        dmp_reg = &reg->iobase_q;
-       for (cnt = 0; cnt < 7; cnt++)
-               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));
+       for (cnt = 0; cnt < 7; cnt++, dmp_reg++)
+               *iter_reg++ = htonl(RD_REG_DWORD(dmp_reg));
 
        /* Transmit DMA registers. */
        iter_reg = fw->xmt0_dma_reg;

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index a918d762bc6bb07aba6f1ebc6b191e9df1b98b31..92547bb41e173cf3ad859c09247f78a32c3121d1 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5085,8 +5085,8 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
        dptr = (uint32_t *)nv;
        ha->isp_ops->read_nvram(vha, (uint8_t *)dptr, ha->nvram_base,
            ha->nvram_size);
-       for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++)
-               chksum += le32_to_cpu(*dptr++);
+       for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++, dptr++)
+               chksum += le32_to_cpu(*dptr);
 
        ql_dbg(ql_dbg_init + ql_dbg_buffer, vha, 0x006a,
            "Contents of NVRAM\n");
@@ -5339,8 +5339,8 @@ uint8_t qla27xx_find_valid_image(struct scsi_qla_host *vha)
        wptr = (uint32_t *)(&pri_image_status);
        cnt = size;
 
-       for (chksum = 0; cnt; cnt--)
-               chksum += le32_to_cpu(*wptr++);
+       for (chksum = 0; cnt--; wptr++)
+               chksum += le32_to_cpu(*wptr);
        if (chksum) {
                ql_dbg(ql_dbg_init, vha, 0x018c,
                    "Checksum validation failed for primary image (0x%x)\n",
@@ -5367,8 +5367,8 @@ check_sec_image:
 
        wptr = (uint32_t *)(&sec_image_status);
        cnt = size;
-       for (chksum = 0; cnt; cnt--)
-               chksum += le32_to_cpu(*wptr++);
+       for (chksum = 0; cnt--; wptr++)
+               chksum += le32_to_cpu(*wptr);
        if (chksum) {
                ql_dbg(ql_dbg_init, vha, 0x018e,
                    "Checksum validation failed for secondary image (0x%x)\n",
@@ -6121,8 +6121,8 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
        ha->isp_ops->read_optrom(vha, ha->nvram, ha->flt_region_nvram << 2,
            ha->nvram_size);
        dptr = (uint32_t *)nv;
-       for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++)
-               chksum += le32_to_cpu(*dptr++);
+       for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++, dptr++)
+               chksum += le32_to_cpu(*dptr);
 
        ql_dbg(ql_dbg_init + ql_dbg_buffer, vha, 0x0111,
            "Contents of NVRAM:\n");

diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
index fee9eb7c8a60090b9f779ade26f1d17d751625cc..deb21dc2a0867205342e0375935d2464c85cb41a 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_inline.h
+++ b/drivers/scsi/qla2xxx/qla_inline.h
@@ -87,8 +87,8 @@ host_to_adap(uint8_t *src, uint8_t *dst, uint32_t bsize)
        __le32 *odest = (__le32 *) dst;
        uint32_t iter = bsize >> 2;
 
-       for (; iter ; iter--)
-               *odest++ = cpu_to_le32(*isrc++);
+       for ( ; iter--; isrc++)
+               *odest++ = cpu_to_le32(*isrc);
 }
 
 static inline void

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 873c28a77c5e25fcefc15c32ecd7523c8e26a1bc..0f02aa53692f794d2a10fcc398610e6d821a2bf5 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -2525,7 +2525,7 @@ qla2x00_get_link_status(scsi_qla_host_t *vha, uint16_t loop_id,
        int rval;
        mbx_cmd_t mc;
        mbx_cmd_t *mcp = &mc;
-       uint32_t *siter, *diter, dwords;
+       uint32_t *iter, dwords;
        struct qla_hw_data *ha = vha->hw;
 
        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1084,
@@ -2567,9 +2567,9 @@ qla2x00_get_link_status(scsi_qla_host_t *vha, uint16_t loop_id,
                            "Done %s.\n", __func__);
                        dwords = offsetof(struct link_statistics,
                                        link_up_cnt) / 4;
-                       siter = diter = &stats->link_fail_cnt;
-                       while (dwords--)
-                               *diter++ = le32_to_cpu(*siter++);
+                       iter = &stats->link_fail_cnt;
+                       for ( ; dwords--; iter++)
+                               le32_to_cpus(iter);
                }
        } else {
                /* Failed. */
@@ -2586,7 +2586,7 @@ qla24xx_get_isp_stats(scsi_qla_host_t *vha, struct link_statistics *stats,
        int rval;
        mbx_cmd_t mc;
        mbx_cmd_t *mcp = &mc;
-       uint32_t *siter, *diter, dwords;
+       uint32_t *iter, dwords;
 
        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1088,
            "Entered %s.\n", __func__);
@@ -2615,9 +2615,9 @@ qla24xx_get_isp_stats(scsi_qla_host_t *vha, struct link_statistics *stats,
                            "Done %s.\n", __func__);
                        /* Copy over data -- firmware data is LE. */
                        dwords = sizeof(struct link_statistics) / 4;
-                       siter = diter = &stats->link_fail_cnt;
-                       while (dwords--)
-                               *diter++ = le32_to_cpu(*siter++);
+                       iter = &stats->link_fail_cnt;
+                       for ( ; dwords--; iter++)
+                               le32_to_cpus(iter);
                }
        } else {
                /* Failed. */

diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 0a8db69d52e08da195df8dbd9121f241a5efed29..5944e28c35cc0e032047c712ae613de14cffebe0 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -610,8 +610,8 @@ qla2xxx_find_flt_start(scsi_qla_host_t *vha, uint32_t *start)
 
        wptr = (uint16_t *)req->ring;
        cnt = sizeof(struct qla_flt_location) >> 1;
-       for (chksum = 0; cnt; cnt--)
-               chksum += le16_to_cpu(*wptr++);
+       for (chksum = 0; cnt--; wptr++)
+               chksum += le16_to_cpu(*wptr);
        if (chksum) {
                ql_log(ql_log_fatal, vha, 0x0045,
                    "Inconsistent FLTL detected: checksum=0x%x.\n", chksum);
@@ -702,8 +702,8 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)
        }
 
        cnt = (sizeof(struct qla_flt_header) + le16_to_cpu(flt->length)) >> 1;
-       for (chksum = 0; cnt; cnt--)
-               chksum += le16_to_cpu(*wptr++);
+       for (chksum = 0; cnt--; wptr++)
+               chksum += le16_to_cpu(*wptr);
        if (chksum) {
                ql_log(ql_log_fatal, vha, 0x0048,
                    "Inconsistent FLT detected: version=0x%x length=0x%x checksum=0x%x.\n",
@@ -930,9 +930,8 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha)
            fdt->sig[3] != 'D')
                goto no_flash_data;
 
-       for (cnt = 0, chksum = 0; cnt < sizeof(struct qla_fdt_layout) >> 1;
-           cnt++)
-               chksum += le16_to_cpu(*wptr++);
+       for (cnt = 0, chksum = 0; cnt < sizeof(*fdt) >> 1; cnt++, wptr++)
+               chksum += le16_to_cpu(*wptr);
        if (chksum) {
                ql_dbg(ql_dbg_init, vha, 0x004c,
                    "Inconsistent FDT detected:"
@@ -1027,7 +1026,8 @@ qla2xxx_get_idc_param(scsi_qla_host_t *vha)
                ha->fcoe_dev_init_timeout = QLA82XX_ROM_DEV_INIT_TIMEOUT;
                ha->fcoe_reset_timeout = QLA82XX_ROM_DRV_RESET_ACK_TIMEOUT;
        } else {
-               ha->fcoe_dev_init_timeout = le32_to_cpu(*wptr++);
+               ha->fcoe_dev_init_timeout = le32_to_cpu(*wptr);
+               wptr++;
                ha->fcoe_reset_timeout = le32_to_cpu(*wptr);
        }
        ql_dbg(ql_dbg_init, vha, 0x004e,
@@ -1104,10 +1104,9 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)
        ha->isp_ops->read_optrom(vha, (uint8_t *)data,
            ha->flt_region_npiv_conf << 2, NPIV_CONFIG_SIZE);
 
-       cnt = (sizeof(struct qla_npiv_header) + le16_to_cpu(hdr.entries) *
-           sizeof(struct qla_npiv_entry)) >> 1;
-       for (wptr = data, chksum = 0; cnt; cnt--)
-               chksum += le16_to_cpu(*wptr++);
+       cnt = (sizeof(hdr) + le16_to_cpu(hdr.entries) * sizeof(*entry)) >> 1;
+       for (wptr = data, chksum = 0; cnt--; wptr++)
+               chksum += le16_to_cpu(*wptr);
        if (chksum) {
                ql_dbg(ql_dbg_user, vha, 0x7092,
                    "Inconsistent NPIV-Config "