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

Commit db6f1c2f authored by Sebastian Herbszt's avatar Sebastian Herbszt Committed by James Bottomley
Browse files

lpfc: remove set but not used variables 



Remove set but not used variables.

Signed-off-by: default avatarSebastian Herbszt <herbszt@gmx.de>
Signed-off-by: default avatarJames Smart <james.smart@avagotech.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent 3bb11fc5

drivers/scsi/lpfc/lpfc_attr.c

+0 −6
Original line number Diff line number Diff line
@@ -1642,8 +1642,6 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \ 
	struct Scsi_Host  *shost = class_to_shost(dev);\

	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;\

	struct lpfc_hba   *phba = vport->phba;\

	uint val = 0;\

	val = phba->cfg_##attr;\

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

			phba->cfg_##attr);\

}
@@ -1808,8 +1806,6 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \ 
{ \

	struct Scsi_Host  *shost = class_to_shost(dev);\

	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;\

	uint val = 0;\

	val = vport->cfg_##attr;\

	return snprintf(buf, PAGE_SIZE, "%d\n", vport->cfg_##attr);\

}
@@ -1835,8 +1831,6 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \ 
{ \

	struct Scsi_Host  *shost = class_to_shost(dev);\

	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;\

	uint val = 0;\

	val = vport->cfg_##attr;\

	return snprintf(buf, PAGE_SIZE, "%#x\n", vport->cfg_##attr);\

}

drivers/scsi/lpfc/lpfc_bsg.c

+0 −20
Original line number Diff line number Diff line
@@ -904,7 +904,6 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
{

	uint32_t evt_req_id = 0;

	uint32_t cmd;

	uint32_t len;

	struct lpfc_dmabuf *dmabuf = NULL;

	struct lpfc_bsg_event *evt;

	struct event_data *evt_dat = NULL;
@@ -946,7 +945,6 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
	ct_req = (struct lpfc_sli_ct_request *)dmabuf->virt;

	evt_req_id = ct_req->FsType;

	cmd = ct_req->CommandResponse.bits.CmdRsp;

	len = ct_req->CommandResponse.bits.Size;

	if (!(phba->sli3_options & LPFC_SLI3_HBQ_ENABLED))

		lpfc_sli_ringpostbuf_put(phba, pring, dmabuf);
@@ -2988,7 +2986,6 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job) 
{

	struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;

	struct lpfc_hba *phba = vport->phba;

	struct diag_mode_test *diag_mode;

	struct lpfc_bsg_event *evt;

	struct event_data *evdat;

	struct lpfc_sli *psli = &phba->sli;
@@ -3031,8 +3028,6 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job) 
		rc = -EINVAL;

		goto loopback_test_exit;

	}

	diag_mode = (struct diag_mode_test *)

		job->request->rqst_data.h_vendor.vendor_cmd;



	if ((phba->link_state == LPFC_HBA_ERROR) ||

	    (psli->sli_flag & LPFC_BLOCK_MGMT_IO) ||
@@ -3293,7 +3288,6 @@ lpfc_bsg_get_dfc_rev(struct fc_bsg_job *job) 
{

	struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;

	struct lpfc_hba *phba = vport->phba;

	struct get_mgmt_rev *event_req;

	struct get_mgmt_rev_reply *event_reply;

	int rc = 0;
@@ -3306,9 +3300,6 @@ lpfc_bsg_get_dfc_rev(struct fc_bsg_job *job) 
		goto job_error;

	}



	event_req = (struct get_mgmt_rev *)

		job->request->rqst_data.h_vendor.vendor_cmd;



	event_reply = (struct get_mgmt_rev_reply *)

		job->reply->reply_data.vendor_reply.vendor_rsp;
@@ -4348,7 +4339,6 @@ static int 
lpfc_bsg_write_ebuf_set(struct lpfc_hba *phba, struct fc_bsg_job *job,

			struct lpfc_dmabuf *dmabuf)

{

	struct lpfc_sli_config_mbox *sli_cfg_mbx;

	struct bsg_job_data *dd_data = NULL;

	LPFC_MBOXQ_t *pmboxq = NULL;

	MAILBOX_t *pmb;
@@ -4362,9 +4352,6 @@ lpfc_bsg_write_ebuf_set(struct lpfc_hba *phba, struct fc_bsg_job *job, 
	phba->mbox_ext_buf_ctx.seqNum++;

	nemb_tp = phba->mbox_ext_buf_ctx.nembType;



	sli_cfg_mbx = (struct lpfc_sli_config_mbox *)

			phba->mbox_ext_buf_ctx.mbx_dmabuf->virt;



	dd_data = kmalloc(sizeof(struct bsg_job_data), GFP_KERNEL);

	if (!dd_data) {

		rc = -ENOMEM;
@@ -4606,7 +4593,6 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job, 
	uint32_t transmit_length, receive_length, mode;

	struct lpfc_mbx_sli4_config *sli4_config;

	struct lpfc_mbx_nembed_cmd *nembed_sge;

	struct mbox_header *header;

	struct ulp_bde64 *bde;

	uint8_t *ext = NULL;

	int rc = 0;
@@ -4804,8 +4790,6 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job, 
				/* rebuild the command for sli4 using our

				 * own buffers like we do for biu diags

				 */

				header = (struct mbox_header *)

						&pmb->un.varWords[0];

				nembed_sge = (struct lpfc_mbx_nembed_cmd *)

						&pmb->un.varWords[0];

				receive_length = nembed_sge->sge[0].length;
@@ -5048,7 +5032,6 @@ lpfc_menlo_cmd(struct fc_bsg_job *job) 
	IOCB_t *cmd;

	int rc = 0;

	struct menlo_command *menlo_cmd;

	struct menlo_response *menlo_resp;

	struct lpfc_dmabuf *bmp = NULL, *cmp = NULL, *rmp = NULL;

	int request_nseg;

	int reply_nseg;
@@ -5088,9 +5071,6 @@ lpfc_menlo_cmd(struct fc_bsg_job *job) 
	menlo_cmd = (struct menlo_command *)

		job->request->rqst_data.h_vendor.vendor_cmd;



	menlo_resp = (struct menlo_response *)

		job->reply->reply_data.vendor_reply.vendor_rsp;



	/* allocate our bsg tracking structure */

	dd_data = kmalloc(sizeof(struct bsg_job_data), GFP_KERNEL);

	if (!dd_data) {

drivers/scsi/lpfc/lpfc_ct.c

+0 −5
Original line number Diff line number Diff line
@@ -575,7 +575,6 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
	struct lpfc_vport *vport = cmdiocb->vport;

	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);

	IOCB_t *irsp;

	struct lpfc_dmabuf *bmp;

	struct lpfc_dmabuf *outp;

	struct lpfc_sli_ct_request *CTrsp;

	struct lpfc_nodelist *ndlp;
@@ -588,7 +587,6 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
	cmdiocb->context_un.rsp_iocb = rspiocb;



	outp = (struct lpfc_dmabuf *) cmdiocb->context2;

	bmp = (struct lpfc_dmabuf *) cmdiocb->context3;

	irsp = &rspiocb->iocb;



	lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT,
@@ -1733,12 +1731,9 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode) 
	case SLI_MGMT_RPRT:

	case SLI_MGMT_RPA:

		{

			lpfc_vpd_t *vp;

			struct serv_parm *hsp;

			int len = 0;



			vp = &phba->vpd;



			if (cmdcode == SLI_MGMT_RPRT) {

				rh = (struct lpfc_fdmi_reg_hba *)

					&CtReq->un.PortID;

drivers/scsi/lpfc/lpfc_els.c

+1 −55
Original line number Diff line number Diff line
@@ -457,11 +457,9 @@ lpfc_issue_reg_vfi(struct lpfc_vport *vport) 
	struct lpfc_hba  *phba = vport->phba;

	LPFC_MBOXQ_t *mboxq;

	struct lpfc_nodelist *ndlp;

	struct serv_parm *sp;

	struct lpfc_dmabuf *dmabuf;

	int rc = 0;



	sp = &phba->fc_fabparam;

	/* move forward in case of SLI4 FC port loopback test and pt2pt mode */

	if ((phba->sli_rev == LPFC_SLI_REV4) &&

	    !(phba->link_flag & LS_LOOPBACK_MODE) &&
@@ -1205,14 +1203,11 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	struct serv_parm *sp;

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli_ring *pring;

	uint8_t *pcmd;

	uint16_t cmdsize;

	uint32_t tmo;

	int rc;



	pring = &phba->sli.ring[LPFC_ELS_RING];



	cmdsize = (sizeof(uint32_t) + sizeof(struct serv_parm));

	elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, ndlp,

				     ndlp->nlp_DID, ELS_CMD_FLOGI);
@@ -1454,8 +1449,6 @@ lpfc_initial_fdisc(struct lpfc_vport *vport) 
void

lpfc_more_plogi(struct lpfc_vport *vport)

{

	int sentplogi;



	if (vport->num_disc_nodes)

		vport->num_disc_nodes--;
@@ -1468,7 +1461,7 @@ lpfc_more_plogi(struct lpfc_vport *vport) 
	/* Check to see if there are more PLOGIs to be sent */

	if (vport->fc_flag & FC_NLP_MORE)

		/* go thru NPR nodes and issue any remaining ELS PLOGIs */

		sentplogi = lpfc_els_disc_plogi(vport);

		lpfc_els_disc_plogi(vport);



	return;

}
@@ -1956,16 +1949,12 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry) 
{

	struct lpfc_hba  *phba = vport->phba;

	struct serv_parm *sp;

	IOCB_t *icmd;

	struct lpfc_nodelist *ndlp;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;

	int ret;



	psli = &phba->sli;



	ndlp = lpfc_findnode_did(vport, did);

	if (ndlp && !NLP_CHK_NODE_ACT(ndlp))

		ndlp = NULL;
@@ -1977,7 +1966,6 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry) 
	if (!elsiocb)

		return 1;



	icmd = &elsiocb->iocb;

	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);



	/* For PLOGI request, remainder of payload is service parameters */
@@ -2034,10 +2022,8 @@ lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
	struct lpfc_vport *vport = cmdiocb->vport;

	struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);

	IOCB_t *irsp;

	struct lpfc_sli *psli;

	struct lpfc_nodelist *ndlp;



	psli = &phba->sli;

	/* we pass cmdiocb to state machine which needs rspiocb as well */

	cmdiocb->context_un.rsp_iocb = rspiocb;
@@ -2117,7 +2103,6 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);

	struct lpfc_hba *phba = vport->phba;

	PRLI *npr;

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	uint8_t *pcmd;

	uint16_t cmdsize;
@@ -2128,7 +2113,6 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	if (!elsiocb)

		return 1;



	icmd = &elsiocb->iocb;

	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);



	/* For PRLI request, remainder of payload is service parameters */
@@ -2413,7 +2397,6 @@ lpfc_issue_els_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);

	struct lpfc_hba  *phba = vport->phba;

	ADISC *ap;

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	uint8_t *pcmd;

	uint16_t cmdsize;
@@ -2424,7 +2407,6 @@ lpfc_issue_els_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	if (!elsiocb)

		return 1;



	icmd = &elsiocb->iocb;

	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);



	/* For ADISC request, remainder of payload is service parameters */
@@ -2478,12 +2460,10 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
	struct lpfc_vport *vport = ndlp->vport;

	struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);

	IOCB_t *irsp;

	struct lpfc_sli *psli;

	struct lpfcMboxq *mbox;

	unsigned long flags;

	uint32_t skip_recovery = 0;



	psli = &phba->sli;

	/* we pass cmdiocb to state machine which needs rspiocb as well */

	cmdiocb->context_un.rsp_iocb = rspiocb;
@@ -2609,7 +2589,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
{

	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);

	struct lpfc_hba  *phba = vport->phba;

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	uint8_t *pcmd;

	uint16_t cmdsize;
@@ -2628,7 +2607,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	if (!elsiocb)

		return 1;



	icmd = &elsiocb->iocb;

	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);

	*((uint32_t *) (pcmd)) = ELS_CMD_LOGO;

	pcmd += sizeof(uint32_t);
@@ -2742,14 +2720,11 @@ int 
lpfc_issue_els_scr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)

{

	struct lpfc_hba  *phba = vport->phba;

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;

	struct lpfc_nodelist *ndlp;



	psli = &phba->sli;

	cmdsize = (sizeof(uint32_t) + sizeof(SCR));



	ndlp = lpfc_findnode_did(vport, nportid);
@@ -2776,7 +2751,6 @@ lpfc_issue_els_scr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry) 
		return 1;

	}



	icmd = &elsiocb->iocb;

	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);



	*((uint32_t *) (pcmd)) = ELS_CMD_SCR;
@@ -2836,9 +2810,7 @@ static int 
lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)

{

	struct lpfc_hba  *phba = vport->phba;

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli *psli;

	FARP *fp;

	uint8_t *pcmd;

	uint32_t *lp;
@@ -2846,7 +2818,6 @@ lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry) 
	struct lpfc_nodelist *ondlp;

	struct lpfc_nodelist *ndlp;



	psli = &phba->sli;

	cmdsize = (sizeof(uint32_t) + sizeof(FARP));



	ndlp = lpfc_findnode_did(vport, nportid);
@@ -2872,7 +2843,6 @@ lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry) 
		return 1;

	}



	icmd = &elsiocb->iocb;

	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);



	*((uint32_t *) (pcmd)) = ELS_CMD_FARPR;
@@ -3922,13 +3892,11 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag, 
	IOCB_t *icmd;

	IOCB_t *oldcmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;

	int rc;

	ELS_PKT *els_pkt_ptr;



	psli = &phba->sli;

	oldcmd = &oldiocb->iocb;



	switch (flag) {
@@ -4061,12 +4029,10 @@ lpfc_els_rsp_reject(struct lpfc_vport *vport, uint32_t rejectError, 
	IOCB_t *icmd;

	IOCB_t *oldcmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;

	int rc;



	psli = &phba->sli;

	cmdsize = 2 * sizeof(uint32_t);

	elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,

				     ndlp->nlp_DID, ELS_CMD_LS_RJT);
@@ -4212,13 +4178,10 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, 
	IOCB_t *icmd;

	IOCB_t *oldcmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;

	int rc;



	psli = &phba->sli;



	cmdsize = sizeof(uint32_t) + sizeof(PRLI);

	elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,

		ndlp->nlp_DID, (ELS_CMD_ACC | (ELS_CMD_PRLI & ~ELS_RSP_MASK)));
@@ -4315,12 +4278,10 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format, 
	RNID *rn;

	IOCB_t *icmd, *oldcmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;

	int rc;



	psli = &phba->sli;

	cmdsize = sizeof(uint32_t) + sizeof(uint32_t)

					+ (2 * sizeof(struct lpfc_name));

	if (format)
@@ -4447,12 +4408,10 @@ lpfc_els_rsp_echo_acc(struct lpfc_vport *vport, uint8_t *data, 
{

	struct lpfc_hba  *phba = vport->phba;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;

	int rc;



	psli = &phba->sli;

	cmdsize = oldiocb->iocb.unsli3.rcvsli3.acc_len;



	/* The accumulated length can exceed the BPL_SIZE.  For
@@ -5181,14 +5140,12 @@ lpfc_els_rcv_lcb(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
{

	struct lpfc_hba *phba = vport->phba;

	struct lpfc_dmabuf *pcmd;

	IOCB_t *icmd;

	uint8_t *lp;

	struct fc_lcb_request_frame *beacon;

	struct lpfc_lcb_context *lcb_context;

	uint8_t state, rjt_err;

	struct ls_rjt stat;



	icmd = &cmdiocb->iocb;

	pcmd = (struct lpfc_dmabuf *)cmdiocb->context2;

	lp = (uint8_t *)pcmd->virt;

	beacon = (struct fc_lcb_request_frame *)pcmd->virt;
@@ -5481,13 +5438,11 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
	struct lpfc_hba  *phba = vport->phba;

	struct lpfc_dmabuf *pcmd;

	uint32_t *lp, *datap;

	IOCB_t *icmd;

	uint32_t payload_len, length, nportid, *cmd;

	int rscn_cnt;

	int rscn_id = 0, hba_id = 0;

	int i;



	icmd = &cmdiocb->iocb;

	pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;

	lp = (uint32_t *) pcmd->virt;
@@ -5943,12 +5898,10 @@ lpfc_els_rcv_rnid(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
{

	struct lpfc_dmabuf *pcmd;

	uint32_t *lp;

	IOCB_t *icmd;

	RNID *rn;

	struct ls_rjt stat;

	uint32_t cmd;



	icmd = &cmdiocb->iocb;

	pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;

	lp = (uint32_t *) pcmd->virt;
@@ -6259,7 +6212,6 @@ lpfc_els_rcv_rls(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
{

	struct lpfc_hba *phba = vport->phba;

	LPFC_MBOXQ_t *mbox;

	struct lpfc_dmabuf *pcmd;

	struct ls_rjt stat;



	if ((ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) &&
@@ -6267,8 +6219,6 @@ lpfc_els_rcv_rls(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
		/* reject the unsolicited RPS request and done with it */

		goto reject_out;



	pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;



	mbox = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC);

	if (mbox) {

		lpfc_read_lnk_stat(phba, mbox);
@@ -6482,7 +6432,6 @@ lpfc_issue_els_rrq(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
{

	struct lpfc_hba  *phba = vport->phba;

	struct RRQ *els_rrq;

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	uint8_t *pcmd;

	uint16_t cmdsize;
@@ -6501,7 +6450,6 @@ lpfc_issue_els_rrq(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	if (!elsiocb)

		return 1;



	icmd = &elsiocb->iocb;

	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);



	/* For RRQ request, remainder of payload is Exchange IDs */
@@ -8428,7 +8376,6 @@ lpfc_issue_els_npiv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
{

	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);

	struct lpfc_hba  *phba = vport->phba;

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	uint8_t *pcmd;

	uint16_t cmdsize;
@@ -8439,7 +8386,6 @@ lpfc_issue_els_npiv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
	if (!elsiocb)

		return 1;



	icmd = &elsiocb->iocb;

	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);

	*((uint32_t *) (pcmd)) = ELS_CMD_LOGO;

	pcmd += sizeof(uint32_t);

drivers/scsi/lpfc/lpfc_hbadisc.c

+4 −7
Original line number Diff line number Diff line
@@ -800,7 +800,6 @@ lpfc_cleanup_rpis(struct lpfc_vport *vport, int remove) 
	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);

	struct lpfc_hba  *phba = vport->phba;

	struct lpfc_nodelist *ndlp, *next_ndlp;

	int  rc;



	list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {

		if (!NLP_CHK_NODE_ACT(ndlp))
@@ -816,7 +815,7 @@ lpfc_cleanup_rpis(struct lpfc_vport *vport, int remove) 
		if ((phba->sli_rev < LPFC_SLI_REV4) &&

		    (!remove && ndlp->nlp_type & NLP_FABRIC))

			continue;

		rc = lpfc_disc_state_machine(vport, ndlp, NULL,

		lpfc_disc_state_machine(vport, ndlp, NULL,

					remove

					? NLP_EVT_DEVICE_RM

					: NLP_EVT_DEVICE_RECOVERY);
@@ -1774,7 +1773,6 @@ lpfc_sli4_fcf_rec_mbox_parse(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq, 
			     uint16_t *next_fcf_index)

{

	void *virt_addr;

	dma_addr_t phys_addr;

	struct lpfc_mbx_sge sge;

	struct lpfc_mbx_read_fcf_tbl *read_fcf;

	uint32_t shdr_status, shdr_add_status, if_type;
@@ -1785,7 +1783,6 @@ lpfc_sli4_fcf_rec_mbox_parse(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq, 
	 * routine only uses a single SGE.

	 */

	lpfc_sli4_mbx_sge_get(mboxq, 0, &sge);

	phys_addr = getPaddr(sge.pa_hi, sge.pa_lo);

	if (unlikely(!mboxq->sge_array)) {

		lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,

				"2524 Failed to get the non-embedded SGE "