scsi: qla2xxx: Improve Linux kernel coding style conformance

Insert a space where required, surround complex expressions in macros with
parentheses, use the UL suffix instead of the (unsigned long) cast, do not
use line continuations when not necessary and do not explicitly initialize
static variables to zero.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Tested-by: Himanshu Madhani <hmadhani@marvell.com>
Reviewed-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index b91ef7b75e8dfdb42ea627fa3135bfd74d9c6409..a94b0d440f0f4feb139b7203d6bed35e3903b3b1 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -117,9 +117,9 @@
 #define RD_REG_BYTE_RELAXED(addr)      readb_relaxed(addr)
 #define RD_REG_WORD_RELAXED(addr)      readw_relaxed(addr)
 #define RD_REG_DWORD_RELAXED(addr)     readl_relaxed(addr)
-#define WRT_REG_BYTE(addr, data)       writeb(data,addr)
-#define WRT_REG_WORD(addr, data)       writew(data,addr)
-#define WRT_REG_DWORD(addr, data)      writel(data,addr)
+#define WRT_REG_BYTE(addr, data)       writeb(data, addr)
+#define WRT_REG_WORD(addr, data)       writew(data, addr)
+#define WRT_REG_DWORD(addr, data)      writel(data, addr)
 
 /*
  * ISP83XX specific remote register addresses
@@ -207,7 +207,7 @@
  * 133Mhz slot.
  */
 #define RD_REG_WORD_PIO(addr)          (inw((unsigned long)addr))
-#define WRT_REG_WORD_PIO(addr, data)   (outw(data,(unsigned long)addr))
+#define WRT_REG_WORD_PIO(addr, data)   (outw(data, (unsigned long)addr))
 
 /*
  * Fibre Channel device definitions.
@@ -3851,7 +3851,7 @@ struct qla_hw_data {
 
        /* NVRAM configuration data */
 #define MAX_NVRAM_SIZE  4096
-#define VPD_OFFSET      MAX_NVRAM_SIZE / 2
+#define VPD_OFFSET      (MAX_NVRAM_SIZE / 2)
        uint16_t        nvram_size;
        uint16_t        nvram_base;
        void            *nvram;

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index d82d1a2b3543abbbb6dc6f48fa22acd8cd67059f..3585eb7b87b54776f3f3b2c3105f0f9572604989 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5397,7 +5397,7 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport)
            "%s %8phN. rport %p is %s mode\n",
            __func__, fcport->port_name, rport,
            (fcport->port_type == FCT_TARGET) ? "tgt" :
-           ((fcport->port_type & FCT_NVME) ? "nvme" :"ini"));
+           ((fcport->port_type & FCT_NVME) ? "nvme" : "ini"));
 
        fc_remote_port_rolechg(rport, rport_ids.roles);
 }

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 1886de92034c7a28dc3392272459f154894a2ece..b514ab4d243ec72911e6c80dd6073d9464e13fef 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -1364,6 +1364,7 @@ qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp,
        cur_dsd++;
        return 0;
 }
+
 /**
  * qla24xx_build_scsi_crc_2_iocbs() - Build IOCB command utilizing Command
  *                                                     Type 6 IOCB types.

diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
index af7919a5acdc93ea959e14194894ac4a5d6c36ed..16028ee8c7a7b9aed3a076252ae7ed0f728d7b3c 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nvme.c
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
@@ -267,7 +267,6 @@ static void qla_nvme_ls_abort(struct nvme_fc_local_port *lport,
        schedule_work(&priv->abort_work);
 }
 
-
 static int qla_nvme_ls_req(struct nvme_fc_local_port *lport,
     struct nvme_fc_remote_port *rport, struct nvmefc_ls_req *fd)
 {

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index c760ae354174c2c155ae6df03c9be0f52c7adb02..c1c832271ccbe00df4864d2e96caa67f0efdac89 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -1985,7 +1985,7 @@ qla82xx_check_rcvpeg_state(struct qla_hw_data *ha)
 }
 
 /* ISR related functions */
-static struct qla82xx_legacy_intr_set legacy_intr[] = \
+static struct qla82xx_legacy_intr_set legacy_intr[] =
        QLA82XX_LEGACY_INTR_CONFIG;
 
 /*
@@ -3286,7 +3286,7 @@ qla82xx_device_state_handler(scsi_qla_host_t *vha)
                case QLA8XXX_DEV_NEED_QUIESCENT:
                        qla82xx_need_qsnt_handler(vha);
                        /* Reset timeout value after quiescence handler */
-                       dev_init_timeout = jiffies + (ha->fcoe_dev_init_timeout\
+                       dev_init_timeout = jiffies + (ha->fcoe_dev_init_timeout
                                                         * HZ);
                        break;
                case QLA8XXX_DEV_QUIESCENT:
@@ -3301,7 +3301,7 @@ qla82xx_device_state_handler(scsi_qla_host_t *vha)
                        qla82xx_idc_lock(ha);
 
                        /* Reset timeout value after quiescence handler */
-                       dev_init_timeout = jiffies + (ha->fcoe_dev_init_timeout\
+                       dev_init_timeout = jiffies + (ha->fcoe_dev_init_timeout
                                                         * HZ);
                        break;
                case QLA8XXX_DEV_FAILED:
@@ -4232,7 +4232,7 @@ qla82xx_md_collect(scsi_qla_host_t *vha)
                goto md_failed;
        }
 
-       entry_hdr = (qla82xx_md_entry_hdr_t *) \
+       entry_hdr = (qla82xx_md_entry_hdr_t *)
            (((uint8_t *)ha->md_tmplt_hdr) + tmplt_hdr->first_entry_offset);
 
        /* Walk through the entry headers */
@@ -4339,7 +4339,7 @@ qla82xx_md_collect(scsi_qla_host_t *vha)
                data_collected = (uint8_t *)data_ptr -
                    (uint8_t *)ha->md_dump;
 skip_nxt_entry:
-               entry_hdr = (qla82xx_md_entry_hdr_t *) \
+               entry_hdr = (qla82xx_md_entry_hdr_t *)
                    (((uint8_t *)entry_hdr) + entry_hdr->entry_size);
        }
 

diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h
index 3c7beef92c3596a6a052432c40129b495375cc92..230abee10598b32feab37c58e076972b3463326b 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx.h
+++ b/drivers/scsi/qla2xxx/qla_nx.h
@@ -486,13 +486,13 @@
 #define QLA82XX_ADDR_QDR_NET           (0x0000000300000000ULL)
 #define QLA82XX_P3_ADDR_QDR_NET_MAX    (0x0000000303ffffffULL)
 
-#define QLA82XX_PCI_CRBSPACE           (unsigned long)0x06000000
-#define QLA82XX_PCI_DIRECT_CRB         (unsigned long)0x04400000
-#define QLA82XX_PCI_CAMQM              (unsigned long)0x04800000
-#define QLA82XX_PCI_CAMQM_MAX          (unsigned long)0x04ffffff
-#define QLA82XX_PCI_DDR_NET            (unsigned long)0x00000000
-#define QLA82XX_PCI_QDR_NET            (unsigned long)0x04000000
-#define QLA82XX_PCI_QDR_NET_MAX                (unsigned long)0x043fffff
+#define QLA82XX_PCI_CRBSPACE           0x06000000UL
+#define QLA82XX_PCI_DIRECT_CRB         0x04400000UL
+#define QLA82XX_PCI_CAMQM              0x04800000UL
+#define QLA82XX_PCI_CAMQM_MAX          0x04ffffffUL
+#define QLA82XX_PCI_DDR_NET            0x00000000UL
+#define QLA82XX_PCI_QDR_NET            0x04000000UL
+#define QLA82XX_PCI_QDR_NET_MAX                0x043fffffUL
 
 /*
  *   Register offsets for MN

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index db1f1aac79f2fa0b6f3b27fbcc004fd2aab1cb90..8f972e1b521518bf7348bbe1d3d734bed40f079f 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -69,7 +69,7 @@ MODULE_PARM_DESC(ql2xplogiabsentdevice,
                "a Fabric scan.  This is needed for several broken switches. "
                "Default is 0 - no PLOGI. 1 - perform PLOGI.");
 
-int ql2xloginretrycount = 0;
+int ql2xloginretrycount;
 module_param(ql2xloginretrycount, int, S_IRUGO);
 MODULE_PARM_DESC(ql2xloginretrycount,
                "Specify an alternate value for the NVRAM login retry count.");
@@ -234,7 +234,7 @@ MODULE_PARM_DESC(ql2xmdenable,
                "0 - MiniDump disabled. "
                "1 (Default) - MiniDump enabled.");
 
-int ql2xexlogins = 0;
+int ql2xexlogins;
 module_param(ql2xexlogins, uint, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(ql2xexlogins,
                 "Number of extended Logins. "
@@ -250,7 +250,7 @@ module_param(ql2xiniexchg, uint, 0644);
 MODULE_PARM_DESC(ql2xiniexchg,
        "Number of initiator exchanges.");
 
-int ql2xfwholdabts = 0;
+int ql2xfwholdabts;
 module_param(ql2xfwholdabts, int, S_IRUGO);
 MODULE_PARM_DESC(ql2xfwholdabts,
                "Allow FW to hold status IOCB until ABTS rsp received. "