Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 457ff3b7 authored by Jayamohan Kallickal's avatar Jayamohan Kallickal Committed by James Bottomley
Browse files

[SCSI] be2iscsi: Fix warnings from new checkpatch.pl 



The latest checkpatch.pl throws some new warnings. Fixing it
to get rid of a bunch of warnings

Signed-off-by: default avatarJayamohan Kallickal <jayamohank@serverengines.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent bbe56c73

drivers/scsi/be2iscsi/be_cmds.c

+12 −12
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ int be_mbox_notify(struct be_ctrl_info *ctrl) 


	status = be_mbox_db_ready_wait(ctrl);

	if (status != 0) {

		SE_DEBUG(DBG_LVL_1, " be_mbox_db_ready_wait failed 1\n");

		SE_DEBUG(DBG_LVL_1, " be_mbox_db_ready_wait failed\n");

		return status;

	}

	val = 0;
@@ -297,7 +297,7 @@ int be_mbox_notify(struct be_ctrl_info *ctrl) 


	status = be_mbox_db_ready_wait(ctrl);

	if (status != 0) {

		SE_DEBUG(DBG_LVL_1, " be_mbox_db_ready_wait failed 2\n");

		SE_DEBUG(DBG_LVL_1, " be_mbox_db_ready_wait failed\n");

		return status;

	}

	if (be_mcc_compl_is_new(compl)) {

drivers/scsi/be2iscsi/be_iscsi.c

+16 −16
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int beiscsi_open_conn(struct iscsi_endpoint *ep, 
		SE_DEBUG(DBG_LVL_1, "No free cid available\n");

		return ret;

	}

	SE_DEBUG(DBG_LVL_8, "In beiscsi_open_conn, ep_cid=%d ",

	SE_DEBUG(DBG_LVL_8, "In beiscsi_open_conn, ep_cid=%d\n",

		 beiscsi_ep->ep_cid);

	phba->ep_array[beiscsi_ep->ep_cid -

		       phba->fw_config.iscsi_cid_start] = ep;
@@ -624,7 +624,7 @@ static int beiscsi_close_conn(struct beiscsi_endpoint *beiscsi_ep, int flag) 


	tag = mgmt_upload_connection(phba, beiscsi_ep->ep_cid, flag);

	if (!tag) {

		SE_DEBUG(DBG_LVL_8, "upload failed for cid 0x%x",

		SE_DEBUG(DBG_LVL_8, "upload failed for cid 0x%x\n",

			 beiscsi_ep->ep_cid);

		ret = -1;

	} else {

drivers/scsi/be2iscsi/be_main.c

+72 −69
Original line number Diff line number Diff line
@@ -1782,9 +1782,9 @@ hwi_write_sgl(struct iscsi_wrb *pwrb, struct scatterlist *sg, 
			sg_len = sg_dma_len(sg);

			addr = (u64) sg_dma_address(sg);

			AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_addr_lo, pwrb,

							(addr & 0xFFFFFFFF));

						((u32)(addr & 0xFFFFFFFF)));

			AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_addr_hi, pwrb,

							(addr >> 32));

							((u32)(addr >> 32)));

			AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_len, pwrb,

							sg_len);

			sge_len = sg_len;
@@ -1794,9 +1794,9 @@ hwi_write_sgl(struct iscsi_wrb *pwrb, struct scatterlist *sg, 
			sg_len = sg_dma_len(sg);

			addr = (u64) sg_dma_address(sg);

			AMAP_SET_BITS(struct amap_iscsi_wrb, sge1_addr_lo, pwrb,

							(addr & 0xFFFFFFFF));

						((u32)(addr & 0xFFFFFFFF)));

			AMAP_SET_BITS(struct amap_iscsi_wrb, sge1_addr_hi, pwrb,

							(addr >> 32));

							((u32)(addr >> 32)));

			AMAP_SET_BITS(struct amap_iscsi_wrb, sge1_len, pwrb,

							sg_len);

		}
@@ -1872,9 +1872,9 @@ static void hwi_write_buffer(struct iscsi_wrb *pwrb, struct iscsi_task *task) 
			addr = 0;

		}

		AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_addr_lo, pwrb,

						(addr & 0xFFFFFFFF));

						((u32)(addr & 0xFFFFFFFF)));

		AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_addr_hi, pwrb,

						(addr >> 32));

						((u32)(addr >> 32)));

		AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_len, pwrb,

						task->data_count);
@@ -1904,9 +1904,9 @@ static void hwi_write_buffer(struct iscsi_wrb *pwrb, struct iscsi_task *task) 
		psgl++;

		if (task->data) {

			AMAP_SET_BITS(struct amap_iscsi_sge, addr_lo, psgl,

						(addr & 0xFFFFFFFF));

						((u32)(addr & 0xFFFFFFFF)));

			AMAP_SET_BITS(struct amap_iscsi_sge, addr_hi, psgl,

						(addr >> 32));

						((u32)(addr >> 32)));

		}

		AMAP_SET_BITS(struct amap_iscsi_sge, len, psgl, 0x106);

	}
@@ -2054,7 +2054,8 @@ static int beiscsi_alloc_mem(struct beiscsi_hba *phba) 
					    mem_descr->mem_array[j - 1].size,

					    mem_descr->mem_array[j - 1].

					    virtual_address,

					    mem_descr->mem_array[j - 1].

					    (unsigned long)mem_descr->

					    mem_array[j - 1].

					    bus_address.u.a64.address);

		}

		if (i) {
@@ -2364,7 +2365,7 @@ be_sgl_create_contiguous(void *virtual_address, 
	WARN_ON(!sgl);



	sgl->va = virtual_address;

	sgl->dma = physical_address;

	sgl->dma = (unsigned long)physical_address;

	sgl->size = length;



	return 0;
@@ -2565,7 +2566,8 @@ beiscsi_create_def_hdr(struct beiscsi_hba *phba, 
			     "be_fill_queue Failed for DEF PDU HDR\n");

		return ret;

	}

	mem->dma = mem_descr->mem_array[idx].bus_address.u.a64.address;

	mem->dma = (unsigned long)mem_descr->mem_array[idx].

				  bus_address.u.a64.address;

	ret = be_cmd_create_default_pdu_queue(&phba->ctrl, cq, dq,

					      def_pdu_ring_sz,

					      phba->params.defpdu_hdr_sz);
@@ -2609,7 +2611,8 @@ beiscsi_create_def_data(struct beiscsi_hba *phba, 
			     "be_fill_queue Failed for DEF PDU DATA\n");

		return ret;

	}

	mem->dma = mem_descr->mem_array[idx].bus_address.u.a64.address;

	mem->dma = (unsigned long)mem_descr->mem_array[idx].

				  bus_address.u.a64.address;

	ret = be_cmd_create_default_pdu_queue(&phba->ctrl, cq, dataq,

					      def_pdu_ring_sz,

					      phba->params.defpdu_data_sz);
@@ -3008,8 +3011,8 @@ static void beiscsi_free_mem(struct beiscsi_hba *phba) 
			pci_free_consistent(phba->pcidev,

			  mem_descr->mem_array[j - 1].size,

			  mem_descr->mem_array[j - 1].virtual_address,

			  mem_descr->mem_array[j - 1].bus_address.

				u.a64.address);

			  (unsigned long)mem_descr->mem_array[j - 1].

			  bus_address.u.a64.address);

		}

		kfree(mem_descr->mem_array);

		mem_descr++;

drivers/scsi/be2iscsi/be_mgmt.c

+3 −3
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ unsigned char mgmt_invalidate_icds(struct beiscsi_hba *phba, 
				&nonemb_cmd.dma);

	if (nonemb_cmd.va == NULL) {

		SE_DEBUG(DBG_LVL_1,

			 "Failed to allocate memory for mgmt_invalidate_icds\n");

			 "Failed to alloc memory for mgmt_invalidate_icds\n");

		spin_unlock(&ctrl->mbox_lock);

		return 0;

	}

drivers/scsi/be2iscsi/be_cmds.h

+10 −10

File changed.

Contains only whitespace changes.

drivers/scsi/be2iscsi/be_main.h

+10 −10

File changed.

Contains only whitespace changes.

drivers/scsi/be2iscsi/be.h

+3 −3

File changed.

Contains only whitespace changes.