diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile
index 11749a0d8..58c48c986 100644
--- a/qla2x00t/qla2x00-target/Makefile
+++ b/qla2x00t/qla2x00-target/Makefile
@@ -9,7 +9,7 @@
 #  modify it under the terms of the GNU General Public License
 #  as published by the Free Software Foundation, version 2
 #  of the License.
-# 
+#
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -20,8 +20,8 @@
 #    all (the default) : make all
 #    clean             : clean files
 #    extraclean        : clean + clean dependencies
-#    install           : install 
-#    uninstall         : uninstall 
+#    install           : install
+#    uninstall         : uninstall
 #
 # Notes :
 #    - install and uninstall must be made as root
@@ -33,7 +33,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR)
 
 EXTRA_CFLAGS += -W -Wno-unused-parameter -Wno-missing-field-initializers
 
-EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS 
+EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
 #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
 EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -fno-inline -fno-inline-functions
 #EXTRA_CFLAGS += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD
diff --git a/qla2x00t/qla_dbg.c b/qla2x00t/qla_dbg.c
index 4dc32b726..4ce10d7c3 100644
--- a/qla2x00t/qla_dbg.c
+++ b/qla2x00t/qla_dbg.c
@@ -141,7 +141,7 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,
 		}
 	}
 
-	*nxt = rval == QLA_SUCCESS ? &ram[cnt]: NULL;
+	*nxt = rval == QLA_SUCCESS ? &ram[cnt] : NULL;
 	return rval;
 }
 
@@ -326,7 +326,7 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram,
 		}
 	}
 
-	*nxt = rval == QLA_SUCCESS ? &ram[cnt]: NULL;
+	*nxt = rval == QLA_SUCCESS ? &ram[cnt] : NULL;
 	return rval;
 }
 
diff --git a/qla2x00t/qla_def.h b/qla2x00t/qla_def.h
index ad0bbbc57..2bb941796 100644
--- a/qla2x00t/qla_def.h
+++ b/qla2x00t/qla_def.h
@@ -128,9 +128,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)
 
 /*
  * The ISP2312 v2 chip cannot access the FLASH/GPIO registers via MMIO in an
@@ -1407,7 +1407,7 @@ typedef struct {
 	uint32_t dseg_0_length;		/* Data segment 0 length. */
 	uint32_t dseg_1_address[2];	/* Data segment 1 address. */
 	uint32_t dseg_1_length;		/* Data segment 1 length. */
-	uint32_t dseg_2_address	[2];	/* Data segment 2 address. */
+	uint32_t dseg_2_address[2];	/* Data segment 2 address. */
 	uint32_t dseg_2_length;		/* Data segment 2 length. */
 	uint32_t dseg_3_address[2];	/* Data segment 3 address. */
 	uint32_t dseg_3_length;		/* Data segment 3 length. */
@@ -2328,7 +2328,7 @@ struct isp_operations {
 	int (*get_flash_version) (struct scsi_qla_host *, void *);
 	int (*start_scsi) (srb_t *);
 	int (*abort_isp) (struct scsi_qla_host *);
-	int (*iospace_config)(struct qla_hw_data*);
+	int (*iospace_config)(struct qla_hw_data *);
 };
 
 /* MSI-X Support *************************************************************/
diff --git a/qla2x00t/qla_gbl.h b/qla2x00t/qla_gbl.h
index ff0c14d1b..27e3fe356 100644
--- a/qla2x00t/qla_gbl.h
+++ b/qla2x00t/qla_gbl.h
@@ -79,7 +79,7 @@ extern void qla2x00_async_adisc_done(struct scsi_qla_host *, fc_port_t *,
 extern void *qla2x00_alloc_iocbs(struct scsi_qla_host *, srb_t *);
 
 extern fc_port_t *
-qla2x00_alloc_fcport(scsi_qla_host_t *, gfp_t );
+qla2x00_alloc_fcport(scsi_qla_host_t *, gfp_t);
 /*
  * Global Data in qla_os.c source file.
  */
@@ -150,7 +150,7 @@ extern void qla24xx_deallocate_vp_id(scsi_qla_host_t *);
 extern int qla24xx_init_vp(scsi_qla_host_t *);
 extern int qla24xx_disable_vp(scsi_qla_host_t *);
 extern int qla24xx_enable_vp(scsi_qla_host_t *);
-extern int qla24xx_control_vp(scsi_qla_host_t *, int );
+extern int qla24xx_control_vp(scsi_qla_host_t *, int);
 extern int qla24xx_modify_vp_config(scsi_qla_host_t *);
 extern int qla2x00_send_change_request(scsi_qla_host_t *, uint16_t, uint16_t);
 extern void qla2x00_vp_stop_timer(scsi_qla_host_t *);
diff --git a/qla2x00t/qla_gs.c b/qla2x00t/qla_gs.c
index d794e55df..4eedcec98 100644
--- a/qla2x00t/qla_gs.c
+++ b/qla2x00t/qla_gs.c
@@ -1629,7 +1629,7 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *vha)
 	eiter->type = cpu_to_be16(FDMI_PORT_MAX_FRAME_SIZE);
 	eiter->len = cpu_to_be16(4 + 4);
 	max_frame_size = IS_FWI2_CAPABLE(ha) ?
-	    le16_to_cpu(icb24->frame_payload_size):
+	    le16_to_cpu(icb24->frame_payload_size) :
 	    le16_to_cpu(ha->init_cb->frame_payload_size);
 	eiter->a.max_frame_size = cpu_to_be32(max_frame_size);
 	size += 4 + 4;
diff --git a/qla2x00t/qla_init.c b/qla2x00t/qla_init.c
index c7542dd5b..6ca8ab051 100644
--- a/qla2x00t/qla_init.c
+++ b/qla2x00t/qla_init.c
@@ -2148,7 +2148,7 @@ qla2x00_configure_hba(scsi_qla_host_t *vha)
 
 	ql_dbg(ql_dbg_disc, vha, 0x2012, "%s success\n", __func__);
 
-	return(rval);
+	return rval;
 }
 
 inline void
@@ -2620,7 +2620,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
 			ha->zio_mode = icb->add_firmware_options[0] &
 			    (BIT_3 | BIT_2 | BIT_1 | BIT_0);
 			ha->zio_timer = icb->interrupt_delay_timer ?
-			    icb->interrupt_delay_timer: 2;
+			    icb->interrupt_delay_timer : 2;
 		}
 		icb->add_firmware_options[0] &=
 		    ~(BIT_3 | BIT_2 | BIT_1 | BIT_0);
@@ -2653,7 +2653,7 @@ qla2x00_rport_del(void *data)
 	unsigned long flags;
 
 	spin_lock_irqsave(fcport->vha->host->host_lock, flags);
-	rport = fcport->drport ? fcport->drport: fcport->rport;
+	rport = fcport->drport ? fcport->drport : fcport->rport;
 	fcport->drport = NULL;
 	spin_unlock_irqrestore(fcport->vha->host->host_lock, flags);
 	if (rport) {
@@ -2771,9 +2771,9 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)
 			ql_dbg(ql_dbg_disc, vha, 0x201e,
 			    "Needs RSCN update and loop transition.\n");
 			rval = QLA_FUNCTION_FAILED;
-		}
-		else
+		} else {
 			rval = qla2x00_configure_fabric(vha);
+		}
 	}
 
 	if (rval == QLA_SUCCESS) {
@@ -4625,11 +4625,11 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
 	ha->flags.disable_risc_code_load = 0;
 	ha->flags.enable_lip_reset = 0;
 	ha->flags.enable_lip_full_login =
-	    le32_to_cpu(nv->host_p) & BIT_10 ? 1: 0;
+	    le32_to_cpu(nv->host_p) & BIT_10 ? 1 : 0;
 	ha->flags.enable_target_reset =
-	    le32_to_cpu(nv->host_p) & BIT_11 ? 1: 0;
+	    le32_to_cpu(nv->host_p) & BIT_11 ? 1 : 0;
 	ha->flags.enable_led_scheme = 0;
-	ha->flags.disable_serdes = le32_to_cpu(nv->host_p) & BIT_5 ? 1: 0;
+	ha->flags.disable_serdes = le32_to_cpu(nv->host_p) & BIT_5 ? 1 : 0;
 
 	ha->operating_mode = (le32_to_cpu(icb->firmware_options_2) &
 	    (BIT_6 | BIT_5 | BIT_4)) >> 4;
@@ -4704,7 +4704,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
 		ha->zio_mode = le32_to_cpu(icb->firmware_options_2) &
 		    (BIT_3 | BIT_2 | BIT_1 | BIT_0);
 		ha->zio_timer = le16_to_cpu(icb->interrupt_delay_timer) ?
-		    le16_to_cpu(icb->interrupt_delay_timer): 2;
+		    le16_to_cpu(icb->interrupt_delay_timer) : 2;
 #endif /* CONFIG_SCSI_QLA2XXX_TARGET */
 	}
 	icb->firmware_options_2 &= cpu_to_le32(
@@ -5352,7 +5352,7 @@ qla84xx_init_chip(scsi_qla_host_t *vha)
 
 	mutex_unlock(&ha->cs84xx->fw_update_mutex);
 
-	return rval != QLA_SUCCESS || status[0] ? QLA_FUNCTION_FAILED:
+	return rval != QLA_SUCCESS || status[0] ? QLA_FUNCTION_FAILED :
 	    QLA_SUCCESS;
 }
 
@@ -5589,11 +5589,11 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
 	ha->flags.disable_risc_code_load = 0;
 	ha->flags.enable_lip_reset = 0;
 	ha->flags.enable_lip_full_login =
-	    le32_to_cpu(nv->host_p) & BIT_10 ? 1: 0;
+	    le32_to_cpu(nv->host_p) & BIT_10 ? 1 : 0;
 	ha->flags.enable_target_reset =
-	    le32_to_cpu(nv->host_p) & BIT_11 ? 1: 0;
+	    le32_to_cpu(nv->host_p) & BIT_11 ? 1 : 0;
 	ha->flags.enable_led_scheme = 0;
-	ha->flags.disable_serdes = le32_to_cpu(nv->host_p) & BIT_5 ? 1: 0;
+	ha->flags.disable_serdes = le32_to_cpu(nv->host_p) & BIT_5 ? 1 : 0;
 
 	ha->operating_mode = (le32_to_cpu(icb->firmware_options_2) &
 	    (BIT_6 | BIT_5 | BIT_4)) >> 4;
@@ -5669,7 +5669,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
 		ha->zio_mode = le32_to_cpu(icb->firmware_options_2) &
 		    (BIT_3 | BIT_2 | BIT_1 | BIT_0);
 		ha->zio_timer = le16_to_cpu(icb->interrupt_delay_timer) ?
-		    le16_to_cpu(icb->interrupt_delay_timer): 2;
+		    le16_to_cpu(icb->interrupt_delay_timer) : 2;
 #endif /* CONFIG_SCSI_QLA2XXX_TARGET */
 	}
 	icb->firmware_options_2 &= cpu_to_le32(
diff --git a/qla2x00t/qla_mbx.c b/qla2x00t/qla_mbx.c
index d836c87ca..f0dd3d509 100644
--- a/qla2x00t/qla_mbx.c
+++ b/qla2x00t/qla_mbx.c
@@ -2782,7 +2782,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
 
 	/* Issue marker IOCB. */
 	rval2 = qla2x00_marker(vha, req, rsp, fcport->loop_id, l,
-	    type == TCF_LUN_RESET ? MK_SYNC_ID_LUN: MK_SYNC_ID);
+	    type == TCF_LUN_RESET ? MK_SYNC_ID_LUN : MK_SYNC_ID);
 	if (rval2 != QLA_SUCCESS) {
 		ql_dbg(ql_dbg_mbx, vha, 0x1099,
 		    "Failed to issue marker IOCB (%x).\n", rval2);
diff --git a/qla2x00t/qla_mid.c b/qla2x00t/qla_mid.c
index 9438849e5..8961c8525 100644
--- a/qla2x00t/qla_mid.c
+++ b/qla2x00t/qla_mid.c
@@ -502,7 +502,7 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
 	if (!vha) {
 		ql_log(ql_log_warn, vha, 0xa005,
 		    "scsi_host_alloc() failed for vport.\n");
-		return(NULL);
+		return NULL;
 	}
 
 	host = vha->host;
diff --git a/qla2x00t/qla_nx.c b/qla2x00t/qla_nx.c
index b8e532c8b..c459ba629 100644
--- a/qla2x00t/qla_nx.c
+++ b/qla2x00t/qla_nx.c
@@ -121,7 +121,7 @@ static struct crb_128M_2M_block_map crb_128M_2M_map[64] = {
 	{0, 0x0000000, 0x0000000, 0x000000},
 	{0, 0x0000000, 0x0000000, 0x000000},
 	{1, 0x01e0000, 0x01e0800, 0x122000},
-	{0, 0x0000000, 0x0000000, 0x000000} } } ,
+	{0, 0x0000000, 0x0000000, 0x000000} } },
 	{{{1, 0x0200000, 0x0210000, 0x180000} } },
 	{{{0, 0,         0,         0} } },
 	{{{1, 0x0400000, 0x0401000, 0x169000} } },
diff --git a/qla2x00t/qla_os.c b/qla2x00t/qla_os.c
index f9ebba662..5f8bad65f 100644
--- a/qla2x00t/qla_os.c
+++ b/qla2x00t/qla_os.c
@@ -130,7 +130,7 @@ MODULE_PARM_DESC(ql2xshiftctondsd,
 
 static void qla2x00_free_device(scsi_qla_host_t *);
 
-int ql2xfdmienable=1;
+int ql2xfdmienable = 1;
 module_param(ql2xfdmienable, int, S_IRUGO);
 MODULE_PARM_DESC(ql2xfdmienable,
 		"Enables FDMI registrations "
@@ -159,7 +159,7 @@ MODULE_PARM_DESC(ql2xenablehba_err_chk,
 		"  1 -- Error isolation enabled only for DIX Type 0\n"
 		"  2 -- Error isolation enabled for all Types\n");
 
-int ql2xiidmaenable=1;
+int ql2xiidmaenable = 1;
 module_param(ql2xiidmaenable, int, S_IRUGO);
 MODULE_PARM_DESC(ql2xiidmaenable,
 		"Enables iIDMA settings "
@@ -248,7 +248,7 @@ MODULE_PARM_DESC(ql2xmdenable,
 /*
  * SCSI host template entry points
  */
-static int qla2xxx_slave_configure(struct scsi_device * device);
+static int qla2xxx_slave_configure(struct scsi_device *device);
 static int qla2xxx_slave_alloc(struct scsi_device *);
 static int qla2xxx_scan_finished(struct Scsi_Host *, unsigned long time);
 static void qla2xxx_scan_start(struct Scsi_Host *);
@@ -316,8 +316,8 @@ struct scsi_host_template qla2xxx_driver_template = {
 #endif /* CONFIG_SCSI_QLA2XXX_TARGET */
 };
 
-static struct scsi_transport_template *qla2xxx_transport_template = NULL;
-struct scsi_transport_template *qla2xxx_transport_vport_template = NULL;
+static struct scsi_transport_template *qla2xxx_transport_template;
+struct scsi_transport_template *qla2xxx_transport_vport_template;
 
 /* TODO Convert to inlines
  *