From 8f7bd68e4a8042f606fd27762d8c4818c6c64bc8 Mon Sep 17 00:00:00 2001

From: Himanshu Madhani <hmadhani@redhat.com>

Date: Thu, 1 Aug 2019 15:55:28 -0400

Subject: [PATCH 068/124] [scsi] scsi: qla2xxx: Leave a blank line after

 declarations

Message-id: <20190801155618.12650-69-hmadhani@redhat.com>

Patchwork-id: 267843

O-Subject: [RHEL 7.8 e-stor PATCH 068/118] scsi: qla2xxx: Leave a blank line after declarations

Bugzilla: 1729270

RH-Acked-by: Jarod Wilson <jarod@redhat.com>

RH-Acked-by: Tony Camuso <tcamuso@redhat.com>

From: Bart Van Assche <bvanassche@acm.org>

Bugzilla 1729270

This patch improves readability of the qla2xxx source code.

Cc: Himanshu Madhani <hmadhani@marvell.com>

Cc: Giridhar Malavali <gmalavali@marvell.com>

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>

Acked-by: Himanshu Madhani <hmadhani@marvell.com>

Signed-off-by: Bart Van Assche <bvanassche@acm.org>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

(cherry picked from commit bd432bb53cffeae1ec3f77338d69bd89d9d45bb2)

Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>

Signed-off-by: Jan Stancek <jstancek@redhat.com>

Conflicts:

	drivers/scsi/qla2xxx/qla_os.c

---

 drivers/scsi/qla2xxx/qla_attr.c   |  9 +++++++++

 drivers/scsi/qla2xxx/qla_bsg.c    |  5 +++++

 drivers/scsi/qla2xxx/qla_dfs.c    |  3 +++

 drivers/scsi/qla2xxx/qla_gs.c     |  2 ++

 drivers/scsi/qla2xxx/qla_init.c   |  5 +++++

 drivers/scsi/qla2xxx/qla_iocb.c   |  2 ++

 drivers/scsi/qla2xxx/qla_isr.c    |  3 +++

 drivers/scsi/qla2xxx/qla_mbx.c    |  1 +

 drivers/scsi/qla2xxx/qla_mr.c     |  2 ++

 drivers/scsi/qla2xxx/qla_nvme.c   |  1 +

 drivers/scsi/qla2xxx/qla_nx.c     | 12 ++++++++++++

 drivers/scsi/qla2xxx/qla_nx2.c    |  3 +--

 drivers/scsi/qla2xxx/qla_os.c     |  5 +++++

 drivers/scsi/qla2xxx/qla_target.c | 18 ++++++++++++++++++

 14 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c

index cd866540c120..6457a6d6d119 100644

--- a/drivers/scsi/qla2xxx/qla_attr.c

+++ b/drivers/scsi/qla2xxx/qla_attr.c

@@ -674,6 +674,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,

 	int type;

 	uint32_t idc_control;

 	uint8_t *tmp_data = NULL;

+

 	if (off != 0)

 		return -EINVAL;

@@ -1080,6 +1081,7 @@ qla2x00_isp_name_show(struct device *dev, struct device_attribute *attr,

 		      char *buf)

 {

 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

+

 	return scnprintf(buf, PAGE_SIZE, "ISP%04X\n", vha->hw->pdev->device);

 }

@@ -1113,6 +1115,7 @@ qla2x00_model_desc_show(struct device *dev, struct device_attribute *attr,

 			char *buf)

 {

 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

+

 	return scnprintf(buf, PAGE_SIZE, "%s\n", vha->hw->model_desc);

 }

@@ -1325,6 +1328,7 @@ qla2x00_optrom_bios_version_show(struct device *dev,

 {

 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

 	struct qla_hw_data *ha = vha->hw;

+

 	return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->bios_revision[1],

 	    ha->bios_revision[0]);

 }

@@ -1335,6 +1339,7 @@ qla2x00_optrom_efi_version_show(struct device *dev,

 {

 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

 	struct qla_hw_data *ha = vha->hw;

+

 	return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->efi_revision[1],

 	    ha->efi_revision[0]);

 }

@@ -1345,6 +1350,7 @@ qla2x00_optrom_fcode_version_show(struct device *dev,

 {

 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

 	struct qla_hw_data *ha = vha->hw;

+

 	return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->fcode_revision[1],

 	    ha->fcode_revision[0]);

 }

@@ -1355,6 +1361,7 @@ qla2x00_optrom_fw_version_show(struct device *dev,

 {

 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

 	struct qla_hw_data *ha = vha->hw;

+

 	return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d %d\n",

 	    ha->fw_revision[0], ha->fw_revision[1], ha->fw_revision[2],

 	    ha->fw_revision[3]);

@@ -1381,6 +1388,7 @@ qla2x00_total_isp_aborts_show(struct device *dev,

 			      struct device_attribute *attr, char *buf)

 {

 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

+

 	return scnprintf(buf, PAGE_SIZE, "%d\n",

 	    vha->qla_stats.total_isp_aborts);

 }

@@ -2819,6 +2827,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)

 	if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) {

 		if (ha->fw_attributes & BIT_4) {

 			int prot = 0, guard;

+

 			vha->flags.difdix_supported = 1;

 			ql_dbg(ql_dbg_user, vha, 0x7082,

 			    "Registered for DIF/DIX type 1 and 3 protection.\n");

diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c

index 7f9acc8cfbe2..783541fec019 100644

--- a/drivers/scsi/qla2xxx/qla_bsg.c

+++ b/drivers/scsi/qla2xxx/qla_bsg.c

@@ -1503,6 +1503,7 @@ qla2x00_update_fru_versions(struct fc_bsg_job *bsg_job)

 	uint32_t count;

 	dma_addr_t sfp_dma;

 	void *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);

+

 	if (!sfp) {

 		bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =

 		    EXT_STATUS_NO_MEMORY;

@@ -1551,6 +1552,7 @@ qla2x00_read_fru_status(struct fc_bsg_job *bsg_job)

 	struct qla_status_reg *sr = (void *)bsg;

 	dma_addr_t sfp_dma;

 	uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);

+

 	if (!sfp) {

 		bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =

 		    EXT_STATUS_NO_MEMORY;

@@ -1599,6 +1601,7 @@ qla2x00_write_fru_status(struct fc_bsg_job *bsg_job)

 	struct qla_status_reg *sr = (void *)bsg;

 	dma_addr_t sfp_dma;

 	uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);

+

 	if (!sfp) {

 		bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =

 		    EXT_STATUS_NO_MEMORY;

@@ -1643,6 +1646,7 @@ qla2x00_write_i2c(struct fc_bsg_job *bsg_job)

 	struct qla_i2c_access *i2c = (void *)bsg;

 	dma_addr_t sfp_dma;

 	uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);

+

 	if (!sfp) {

 		bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =

 		    EXT_STATUS_NO_MEMORY;

@@ -1686,6 +1690,7 @@ qla2x00_read_i2c(struct fc_bsg_job *bsg_job)

 	struct qla_i2c_access *i2c = (void *)bsg;

 	dma_addr_t sfp_dma;

 	uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);

+

 	if (!sfp) {

 		bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =

 		    EXT_STATUS_NO_MEMORY;

diff --git a/drivers/scsi/qla2xxx/qla_dfs.c b/drivers/scsi/qla2xxx/qla_dfs.c

index 4dd857da215a..d4f54a61cf33 100644

--- a/drivers/scsi/qla2xxx/qla_dfs.c

+++ b/drivers/scsi/qla2xxx/qla_dfs.c

@@ -41,6 +41,7 @@ static int

 qla2x00_dfs_tgt_sess_open(struct inode *inode, struct file *file)

 {

 	scsi_qla_host_t *vha = inode->i_private;

+

 	return single_open(file, qla2x00_dfs_tgt_sess_show, vha);

 }

@@ -161,6 +162,7 @@ static int

 qla_dfs_fw_resource_cnt_open(struct inode *inode, struct file *file)

 {

 	struct scsi_qla_host *vha = inode->i_private;

+

 	return single_open(file, qla_dfs_fw_resource_cnt_show, vha);

 }

@@ -250,6 +252,7 @@ static int

 qla_dfs_tgt_counters_open(struct inode *inode, struct file *file)

 {

 	struct scsi_qla_host *vha = inode->i_private;

+

 	return single_open(file, qla_dfs_tgt_counters_show, vha);

 }

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c

index 34f8f39cdbe2..6593203a19e1 100644

--- a/drivers/scsi/qla2xxx/qla_gs.c

+++ b/drivers/scsi/qla2xxx/qla_gs.c

@@ -1385,6 +1385,7 @@ qla2x00_mgmt_svr_login(scsi_qla_host_t *vha)

 	int ret, rval;

 	uint16_t mb[MAILBOX_REGISTER_COUNT];

 	struct qla_hw_data *ha = vha->hw;

+

 	ret = QLA_SUCCESS;

 	if (vha->flags.management_server_logged_in)

 		return ret;

@@ -1423,6 +1424,7 @@ qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *vha, uint32_t req_size,

 {

 	ms_iocb_entry_t *ms_pkt;

 	struct qla_hw_data *ha = vha->hw;

+

 	ms_pkt = ha->ms_iocb;

 	memset(ms_pkt, 0, sizeof(ms_iocb_entry_t));

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c

index 88a77c4b2f13..735ed201bbfd 100644

--- a/drivers/scsi/qla2xxx/qla_init.c

+++ b/drivers/scsi/qla2xxx/qla_init.c

@@ -1482,6 +1482,7 @@ int qla24xx_post_newsess_work(struct scsi_qla_host *vha, port_id_t *id,

     u8 *port_name, u8 *node_name, void *pla, u8 fc4_type)

 {

 	struct qla_work_evt *e;

+

 	e = qla2x00_alloc_work(vha, QLA_EVT_NEW_SESS);

 	if (!e)

 		return QLA_FUNCTION_FAILED;

@@ -1558,6 +1559,7 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea)

 			return;

 		{

 			unsigned long flags;

+

 			fcport = qla2x00_find_fcport_by_nportid

 				(vha, &ea->id, 1);

 			if (fcport) {

@@ -4858,6 +4860,7 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)

 	int  rval;

 	unsigned long flags, save_flags;

 	struct qla_hw_data *ha = vha->hw;

+

 	rval = QLA_SUCCESS;

 	/* Get Initiator ID */

@@ -6413,6 +6416,7 @@ qla83xx_initiating_reset(scsi_qla_host_t *vha)

 		qla83xx_idc_audit(vha, IDC_AUDIT_TIMESTAMP);

 	} else {

 		const char *state = qla83xx_dev_state_to_string(dev_state);

+

 		ql_log(ql_log_info, vha, 0xb057, "HW State: %s.\n", state);

 		/* SV: XXX: Is timeout required here? */

@@ -8217,6 +8221,7 @@ void

 qla84xx_put_chip(struct scsi_qla_host *vha)

 {

 	struct qla_hw_data *ha = vha->hw;

+

 	if (ha->cs84xx)

 		kref_put(&ha->cs84xx->kref, __qla84xx_chip_release);

 }

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c

index 9f7847adfc36..8214d43d69c8 100644

--- a/drivers/scsi/qla2xxx/qla_iocb.c

+++ b/drivers/scsi/qla2xxx/qla_iocb.c

@@ -1114,6 +1114,7 @@ qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp,

 	if (sp) {

 		struct scsi_cmnd *cmd = GET_CMD_SP(sp);

+

 		sgl = scsi_prot_sglist(cmd);

 		vha = sp->vha;

 		difctx = sp->u.scmd.ctx;

@@ -3442,6 +3443,7 @@ sufficient_dsds:

 		cmd_pkt->entry_status = (uint8_t) rsp->id;

 	} else {

 		struct cmd_type_7 *cmd_pkt;

+

 		req_cnt = qla24xx_calc_iocbs(vha, tot_dsds);

 		if (req->cnt < (req_cnt + 2)) {

 			cnt = (uint16_t)RD_REG_DWORD_RELAXED(

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c

index 4c2f21d6735b..1c6022bbe734 100644

--- a/drivers/scsi/qla2xxx/qla_isr.c

+++ b/drivers/scsi/qla2xxx/qla_isr.c

@@ -839,6 +839,7 @@ skip_rio:

 				if (ha->flags.fawwpn_enabled &&

 				    (ha->current_topology == ISP_CFG_F)) {

 					void *wwpn = ha->init_cb->port_name;

+

 					memcpy(vha->port_name, wwpn, WWN_SIZE);

 					fc_host_port_name(vha->host) =

 					    wwn_to_u64(vha->port_name);

@@ -2247,6 +2248,7 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt,

 	struct fc_bsg_job *bsg_job = NULL;

 	sts_entry_t *sts;

 	struct sts_entry_24xx *sts24;

+

 	sts = (sts_entry_t *) pkt;

 	sts24 = (struct sts_entry_24xx *) pkt;

@@ -3082,6 +3084,7 @@ process_err:

 	/* Adjust ring index */

 	if (IS_P3P_TYPE(ha)) {

 		struct device_reg_82xx __iomem *reg = &ha->iobase->isp82;

+

 		WRT_REG_DWORD(&reg->rsp_q_out[0], rsp->ring_index);

 	} else {

 		WRT_REG_DWORD(rsp->rsp_q_out, rsp->ring_index);

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c

index 2b2678e1b043..401857a4a810 100644

--- a/drivers/scsi/qla2xxx/qla_mbx.c

+++ b/drivers/scsi/qla2xxx/qla_mbx.c

@@ -5732,6 +5732,7 @@ qla8044_md_get_template(scsi_qla_host_t *vha)

 	mbx_cmd_t *mcp = &mc;

 	int rval = QLA_FUNCTION_FAILED;

 	int offset = 0, size = MINIDUMP_SIZE_36K;

+

 	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0xb11f,

 	    "Entered %s.\n", __func__);

diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c

index a3464a76e0b4..ffe2a4887b07 100644

--- a/drivers/scsi/qla2xxx/qla_mr.c

+++ b/drivers/scsi/qla2xxx/qla_mr.c

@@ -1321,6 +1321,7 @@ qlafx00_configure_devices(scsi_qla_host_t *vha)

 {

 	int  rval;

 	unsigned long flags;

+

 	rval = QLA_SUCCESS;

 	flags = vha->dpc_flags;

@@ -3322,6 +3323,7 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)

 		fx_iocb.flags = fxio->u.fxiocb.flags;

 	} else {

 		struct scatterlist *sg;

+

 		bsg_job = sp->u.bsg_job;

 		piocb_rqst = (struct qla_mt_iocb_rqst_fx00 *)

 			&bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];

diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c

index cbde02279838..6bf61f82a011 100644

--- a/drivers/scsi/qla2xxx/qla_nvme.c

+++ b/drivers/scsi/qla2xxx/qla_nvme.c

@@ -368,6 +368,7 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp)

 	if (unlikely(!fd->sqid)) {

 		struct nvme_fc_cmd_iu *cmd = fd->cmdaddr;

+

 		if (cmd->sqe.common.opcode == nvme_admin_async_event) {

 			nvme->u.nvme.aen_op = 1;

 			atomic_inc(&ha->nvme_active_aen_cnt);

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c

index 5b407708c105..8b325a2e6715 100644

--- a/drivers/scsi/qla2xxx/qla_nx.c

+++ b/drivers/scsi/qla2xxx/qla_nx.c

@@ -603,6 +603,7 @@ qla82xx_pci_set_window(struct qla_hw_data *ha, unsigned long long addr)

 	} else if (addr_in_range(addr, QLA82XX_ADDR_OCM0,

 		QLA82XX_ADDR_OCM0_MAX)) {

 		unsigned int temp1;

+

 		if ((addr & 0x00ff800) == 0xff800) {

 			ql_log(ql_log_warn, vha, 0xb004,

 			    "%s: QM access not handled.\n", __func__);

@@ -985,6 +986,7 @@ static int

 qla82xx_read_status_reg(struct qla_hw_data *ha, uint32_t *val)

 {

 	scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);

+

 	qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_INSTR_OPCODE, M25P_INSTR_RDSR);

 	qla82xx_wait_rom_busy(ha);

 	if (qla82xx_wait_rom_done(ha)) {

@@ -1025,6 +1027,7 @@ static int

 qla82xx_flash_set_write_enable(struct qla_hw_data *ha)

 {

 	uint32_t val;

+

 	qla82xx_wait_rom_busy(ha);

 	qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_ABYTE_CNT, 0);

 	qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_INSTR_OPCODE, M25P_INSTR_WREN);

@@ -1042,6 +1045,7 @@ static int

 qla82xx_write_status_reg(struct qla_hw_data *ha, uint32_t val)

 {

 	scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);

+

 	if (qla82xx_flash_set_write_enable(ha))

 		return -1;

 	qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_WDATA, val);

@@ -1058,6 +1062,7 @@ static int

 qla82xx_write_disable_flash(struct qla_hw_data *ha)

 {

 	scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);

+

 	qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_INSTR_OPCODE, M25P_INSTR_WRDI);

 	if (qla82xx_wait_rom_done(ha)) {

 		ql_log(ql_log_warn, vha, 0xb00f,

@@ -1430,6 +1435,7 @@ qla82xx_fw_load_from_flash(struct qla_hw_data *ha)

 	long memaddr = BOOTLD_START;

 	u64 data;

 	u32 high, low;

+

 	size = (IMAGE_START - BOOTLD_START) / 8;

 	for (i = 0; i < size; i++) {

@@ -1756,6 +1762,7 @@ int

 qla82xx_reset_chip(scsi_qla_host_t *vha)

 {

 	struct qla_hw_data *ha = vha->hw;

+

 	ha->isp_ops->disable_intrs(ha);

 	return QLA_SUCCESS;

@@ -1989,6 +1996,7 @@ qla82xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)

 	uint16_t __iomem *wptr;

 	struct qla_hw_data *ha = vha->hw;

 	struct device_reg_82xx __iomem *reg = &ha->iobase->isp82;

+

 	wptr = (uint16_t __iomem *)&reg->mailbox_out[1];

 	/* Load return mailbox registers. */

@@ -2259,6 +2267,7 @@ void

 qla82xx_enable_intrs(struct qla_hw_data *ha)

 {

 	scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);

+

 	qla82xx_mbx_intr_enable(vha);

 	spin_lock_irq(&ha->hardware_lock);

 	if (IS_QLA8044(ha))

@@ -2273,6 +2282,7 @@ void

 qla82xx_disable_intrs(struct qla_hw_data *ha)

 {

 	scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);

+

 	qla82xx_mbx_intr_disable(vha);

 	spin_lock_irq(&ha->hardware_lock);

 	if (IS_QLA8044(ha))

@@ -4460,6 +4470,7 @@ qla82xx_beacon_on(struct scsi_qla_host *vha)

 	int rval;

 	struct qla_hw_data *ha = vha->hw;

+

 	qla82xx_idc_lock(ha);

 	rval = qla82xx_mbx_beacon_ctl(vha, 1);

@@ -4480,6 +4491,7 @@ qla82xx_beacon_off(struct scsi_qla_host *vha)

 	int rval;

 	struct qla_hw_data *ha = vha->hw;

+

 	qla82xx_idc_lock(ha);

 	rval = qla82xx_mbx_beacon_ctl(vha, 0);

diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c

index 412d589fe550..68a68d55c35b 100644

--- a/drivers/scsi/qla2xxx/qla_nx2.c

+++ b/drivers/scsi/qla2xxx/qla_nx2.c

@@ -2990,10 +2990,9 @@ qla8044_minidump_process_rddfe(struct scsi_qla_host *vha,

 	uint16_t count;

 	uint32_t poll, mask, modify_mask;

 	uint32_t wait_count = 0;

-

 	uint32_t *data_ptr = *d_ptr;

-

 	struct qla8044_minidump_entry_rddfe *rddfe;

+

 	rddfe = (struct qla8044_minidump_entry_rddfe *) entry_hdr;

 	addr1 = rddfe->addr_1;

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c

index 03d7d0af1f98..545208fa08c5 100644

--- a/drivers/scsi/qla2xxx/qla_os.c

+++ b/drivers/scsi/qla2xxx/qla_os.c

@@ -413,6 +413,7 @@ static void qla_init_base_qpair(struct scsi_qla_host *vha, struct req_que *req,

     struct rsp_que *rsp)

 {

 	struct qla_hw_data *ha = vha->hw;

+

 	rsp->qpair = ha->base_qpair;

 	rsp->req = req;

 	ha->base_qpair->hw = ha;

@@ -437,6 +438,7 @@ static int qla2x00_alloc_queues(struct qla_hw_data *ha, struct req_que *req,

 				struct rsp_que *rsp)

 {

 	scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);

+

 	ha->req_q_map = kzalloc(sizeof(struct req_que *) * ha->max_req_queues,

 				GFP_KERNEL);

 	if (!ha->req_q_map) {

@@ -3519,6 +3521,7 @@ skip_dpc:

 	if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) {

 		if (ha->fw_attributes & BIT_4) {

 			int prot = 0, guard;

+

 			base_vha->flags.difdix_supported = 1;

 			ql_dbg(ql_dbg_init, base_vha, 0x00f1,

 			    "Registering for DIF/DIX type 1 and 3 protection.\n");

@@ -4015,6 +4018,7 @@ qla2x00_schedule_rport_del(struct scsi_qla_host *vha, fc_port_t *fcport,

 		qla2xxx_wake_dpc(base_vha);

 	} else {

 		int now;

+

 		if (rport) {

 			ql_dbg(ql_dbg_disc, fcport->vha, 0x2109,

 			    "%s %8phN. rport %p roles %x\n",

@@ -5763,6 +5767,7 @@ qla83xx_force_lock_recovery(scsi_qla_host_t *base_vha)

 	uint32_t idc_lck_rcvry_stage_mask = 0x3;

 	uint32_t idc_lck_rcvry_owner_mask = 0x3c;

 	struct qla_hw_data *ha = base_vha->hw;

+

 	ql_dbg(ql_dbg_p3p, base_vha, 0xb086,

 	    "Trying force recovery of the IDC lock.\n");

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c

index 11e8a25973d8..6ed6bb8eb40f 100644

--- a/drivers/scsi/qla2xxx/qla_target.c

+++ b/drivers/scsi/qla2xxx/qla_target.c

@@ -177,6 +177,7 @@ static inline int qlt_issue_marker(struct scsi_qla_host *vha, int vha_locked)

 	/* Send marker if required */

 	if (unlikely(vha->marker_needed != 0)) {

 		int rc = qla2x00_issue_marker(vha, vha_locked);

+

 		if (rc != QLA_SUCCESS) {

 			ql_dbg(ql_dbg_tgt, vha, 0xe03d,

 			    "qla_target(%d): issue_marker() failed\n",

@@ -550,6 +551,7 @@ static int qla24xx_post_nack_work(struct scsi_qla_host *vha, fc_port_t *fcport,

 	struct imm_ntfy_from_isp *ntfy, int type)

 {

 	struct qla_work_evt *e;

+

 	e = qla2x00_alloc_work(vha, QLA_EVT_NACK);

 	if (!e)

 		return QLA_FUNCTION_FAILED;

@@ -1071,6 +1073,7 @@ void qlt_free_session_done(struct work_struct *work)

 		struct qlt_plogi_ack_t *con =

 		    sess->plogi_link[QLT_PLOGI_LINK_CONFLICT];

 		struct imm_ntfy_from_isp *iocb;

+

 		own = sess->plogi_link[QLT_PLOGI_LINK_SAME_WWN];

 		if (con) {

@@ -1322,6 +1325,7 @@ static int qla24xx_get_loop_id(struct scsi_qla_host *vha, const uint8_t *s_id,

 	res = -ENOENT;

 	for (i = 0; i < entries; i++) {

 		struct gid_list_info *gid = (struct gid_list_info *)id_iter;

+

 		if ((gid->al_pa == s_id[2]) &&

 		    (gid->area == s_id[1]) &&

 		    (gid->domain == s_id[0])) {

@@ -2478,6 +2482,7 @@ static void qlt_unmap_sg(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd)

 {

 	struct qla_hw_data *ha;

 	struct qla_qpair *qpair;

+

 	if (!cmd->sg_mapped)

 		return;

@@ -3906,6 +3911,7 @@ static int qlt_term_ctio_exchange(struct qla_qpair *qpair, void *ctio,

 	if (ctio != NULL) {

 		struct ctio7_from_24xx *c = (struct ctio7_from_24xx *)ctio;

+

 		term = !(c->flags &

 		    cpu_to_le16(OF_TERM_EXCH));

 	} else

@@ -4748,6 +4754,7 @@ static int abort_cmds_for_s_id(struct scsi_qla_host *vha, port_id_t *s_id)

 	list_for_each_entry(op, &vha->unknown_atio_list, cmd_list) {

 		uint32_t op_key = sid_to_key(op->atio.u.isp24.fcp_hdr.s_id);

+

 		if (op_key == key) {

 			op->aborted = true;

 			count++;

@@ -4756,6 +4763,7 @@ static int abort_cmds_for_s_id(struct scsi_qla_host *vha, port_id_t *s_id)

 	list_for_each_entry(cmd, &vha->qla_cmd_list, cmd_list) {

 		uint32_t cmd_key = sid_to_key(cmd->atio.u.isp24.fcp_hdr.s_id);

+

 		if (cmd_key == key) {

 			cmd->aborted = 1;

 			count++;

@@ -5026,6 +5034,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,

 		if (sess != NULL) {

 			bool delete = false;

 			int sec;

+

 			spin_lock_irqsave(&tgt->ha->tgt.sess_lock, flags);

 			switch (sess->fw_login_state) {

 			case DSC_LS_PLOGI_PEND:

@@ -5178,6 +5187,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,

 	case ELS_ADISC:

 	{

 		struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;

+

 		if (tgt->link_reinit_iocb_pending) {

 			qlt_send_notify_ack(ha->base_qpair,

 			    &tgt->link_reinit_iocb, 0, 0, 0, 0, 0, 0);

@@ -5241,6 +5251,7 @@ static void qlt_handle_imm_notify(struct scsi_qla_host *vha,

 	case IMM_NTFY_LIP_LINK_REINIT:

 	{

 		struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;

+

 		ql_dbg(ql_dbg_tgt_mgt, vha, 0xf033,

 		    "qla_target(%d): LINK REINIT (loop %#x, "

 		    "subcode %x)\n", vha->vp_idx,

@@ -5857,6 +5868,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,

 	case CTIO_TYPE7:

 	{

 		struct ctio7_from_24xx *entry = (struct ctio7_from_24xx *)pkt;

+

 		qlt_do_ctio_completion(vha, rsp, entry->handle,

 		    le16_to_cpu(entry->status)|(pkt->entry_status << 16),

 		    entry);

@@ -5867,6 +5879,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,

 	{

 		struct atio_from_isp *atio = (struct atio_from_isp *)pkt;

 		int rc;

+

 		if (atio->u.isp2x.status !=

 		    cpu_to_le16(ATIO_CDB_VALID)) {

 			ql_dbg(ql_dbg_tgt, vha, 0xe05e,

@@ -5915,6 +5928,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,

 	case CONTINUE_TGT_IO_TYPE:

 	{

 		struct ctio_to_2xxx *entry = (struct ctio_to_2xxx *)pkt;

+

 		qlt_do_ctio_completion(vha, rsp, entry->handle,

 		    le16_to_cpu(entry->status)|(pkt->entry_status << 16),

 		    entry);

@@ -5924,6 +5938,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,

 	case CTIO_A64_TYPE:

 	{

 		struct ctio_to_2xxx *entry = (struct ctio_to_2xxx *)pkt;

+

 		qlt_do_ctio_completion(vha, rsp, entry->handle,

 		    le16_to_cpu(entry->status)|(pkt->entry_status << 16),

 		    entry);

@@ -5938,6 +5953,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,

 	case NOTIFY_ACK_TYPE:

 		if (tgt->notify_ack_expected > 0) {

 			struct nack_to_isp *entry = (struct nack_to_isp *)pkt;

+

 			ql_dbg(ql_dbg_tgt, vha, 0xe036,

 			    "NOTIFY_ACK seq %08x status %x\n",

 			    le16_to_cpu(entry->u.isp2x.seq_id),

@@ -6213,6 +6229,7 @@ retry:

 		if (rc == -ENOENT) {

 			qlt_port_logo_t logo;

+

 			sid_to_portid(s_id, &logo.id);

 			logo.cmd_count = 1;

 			qlt_send_first_logo(vha, &logo);

@@ -6472,6 +6489,7 @@ int qlt_add_target(struct qla_hw_data *ha, struct scsi_qla_host *base_vha)

 		unsigned long flags;

 		struct qla_qpair *qpair = ha->queue_pair_map[i];

+

 		h = &tgt->qphints[i + 1];

 		INIT_LIST_HEAD(&h->hint_elem);

 		if (qpair) {

-- 

2.13.6