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

Commit b27cbd55 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: lpfc: Remove set-but-not-used variables 



This patch does not change any functionality but avoids that the compiler
complains about set-but-not-used variables when building with W=1.

Cc: James Smart <james.smart@broadcom.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Acked-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a73cb814

drivers/scsi/lpfc/lpfc_els.c

+10 −14
Original line number Diff line number Diff line
@@ -1961,7 +1961,7 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
	IOCB_t *irsp;

	struct lpfc_nodelist *ndlp;

	struct lpfc_dmabuf *prsp;

	int disc, rc;

	int disc;



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

	cmdiocb->context_un.rsp_iocb = rspiocb;
@@ -1990,7 +1990,6 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
	disc = (ndlp->nlp_flag & NLP_NPR_2B_DISC);

	ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;

	spin_unlock_irq(shost->host_lock);

	rc = 0;



	/* PLOGI completes to NPort <nlp_DID> */

	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
@@ -2029,10 +2028,8 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
				 ndlp->nlp_DID, irsp->ulpStatus,

				 irsp->un.ulpWord[4]);

		/* Do not call DSM for lpfc_els_abort'ed ELS cmds */

		if (lpfc_error_lost_link(irsp))

			rc = NLP_STE_FREED_NODE;

		else

			rc = lpfc_disc_state_machine(vport, ndlp, cmdiocb,

		if (!lpfc_error_lost_link(irsp))

			lpfc_disc_state_machine(vport, ndlp, cmdiocb,

						NLP_EVT_CMPL_PLOGI);

	} else {

		/* Good status, call state machine */
@@ -2040,7 +2037,7 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
				   cmdiocb->context2)->list.next,

				  struct lpfc_dmabuf, list);

		ndlp = lpfc_plogi_confirm_nport(phba, prsp->virt, ndlp);

		rc = lpfc_disc_state_machine(vport, ndlp, cmdiocb,

		lpfc_disc_state_machine(vport, ndlp, cmdiocb,

					     NLP_EVT_CMPL_PLOGI);

	}
@@ -6744,12 +6741,11 @@ lpfc_els_rcv_rnid(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
	uint32_t *lp;

	RNID *rn;

	struct ls_rjt stat;

	uint32_t cmd;



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

	lp = (uint32_t *) pcmd->virt;



	cmd = *lp++;

	lp++;

	rn = (RNID *) lp;



	/* RNID received */
@@ -7508,14 +7504,14 @@ lpfc_els_rcv_farp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
	uint32_t *lp;

	IOCB_t *icmd;

	FARP *fp;

	uint32_t cmd, cnt, did;

	uint32_t cnt, did;



	icmd = &cmdiocb->iocb;

	did = icmd->un.elsreq64.remoteID;

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

	lp = (uint32_t *) pcmd->virt;



	cmd = *lp++;

	lp++;

	fp = (FARP *) lp;

	/* FARP-REQ received from DID <did> */

	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
@@ -7580,14 +7576,14 @@ lpfc_els_rcv_farpr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
	struct lpfc_dmabuf *pcmd;

	uint32_t *lp;

	IOCB_t *icmd;

	uint32_t cmd, did;

	uint32_t did;



	icmd = &cmdiocb->iocb;

	did = icmd->un.elsreq64.remoteID;

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

	lp = (uint32_t *) pcmd->virt;



	cmd = *lp++;

	lp++;

	/* FARP-RSP received from DID <did> */

	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,

			 "0600 FARP-RSP received from DID x%x\n", did);

drivers/scsi/lpfc/lpfc_nportdisc.c

+2 −3
Original line number Diff line number Diff line
@@ -1733,7 +1733,6 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_vport *vport, 
	LPFC_MBOXQ_t *pmb = (LPFC_MBOXQ_t *) arg;

	MAILBOX_t *mb = &pmb->u.mb;

	uint32_t did  = mb->un.varWords[1];

	int rc = 0;



	if (mb->mbxStatus) {

		/* RegLogin failed */
@@ -1806,8 +1805,8 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_vport *vport, 
			 * GFT_ID to determine if remote port supports NVME.

			 */

			if (vport->cfg_enable_fc4_type != LPFC_ENABLE_FCP) {

				rc = lpfc_ns_cmd(vport, SLI_CTNS_GFT_ID,

						 0, ndlp->nlp_DID);

				lpfc_ns_cmd(vport, SLI_CTNS_GFT_ID, 0,

					    ndlp->nlp_DID);

				return ndlp->nlp_state;

			}

			ndlp->nlp_fc4_type = NLP_FC4_FCP;

drivers/scsi/lpfc/lpfc_nvmet.c

+3 −12
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ lpfc_nvmet_ctxbuf_post(struct lpfc_hba *phba, struct lpfc_nvmet_ctxbuf *ctx_buf) 
	struct fc_frame_header *fc_hdr;

	struct rqb_dmabuf *nvmebuf;

	struct lpfc_nvmet_ctx_info *infop;

	uint32_t *payload;

	uint32_t size, oxid, sid;

	int cpu;

	unsigned long iflag;
@@ -370,7 +369,6 @@ lpfc_nvmet_ctxbuf_post(struct lpfc_hba *phba, struct lpfc_nvmet_ctxbuf *ctx_buf) 
		fc_hdr = (struct fc_frame_header *)(nvmebuf->hbuf.virt);

		oxid = be16_to_cpu(fc_hdr->fh_ox_id);

		tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private;

		payload = (uint32_t *)(nvmebuf->dbuf.virt);

		size = nvmebuf->bytes_recv;

		sid = sli4_sid_from_fc_hdr(fc_hdr);
@@ -2023,7 +2021,6 @@ lpfc_nvmet_unsol_fcp_buffer(struct lpfc_hba *phba, 
	struct fc_frame_header *fc_hdr;

	struct lpfc_nvmet_ctxbuf *ctx_buf;

	struct lpfc_nvmet_ctx_info *current_infop;

	uint32_t *payload;

	uint32_t size, oxid, sid, qno;

	unsigned long iflag;

	int current_cpu;
@@ -2101,7 +2098,6 @@ lpfc_nvmet_unsol_fcp_buffer(struct lpfc_hba *phba, 
		return;

	}



	payload = (uint32_t *)(nvmebuf->dbuf.virt);

	sid = sli4_sid_from_fc_hdr(fc_hdr);



	ctxp = (struct lpfc_nvmet_rcv_ctx *)ctx_buf->context;
@@ -2717,12 +2713,11 @@ lpfc_nvmet_sol_fcp_abort_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe, 
{

	struct lpfc_nvmet_rcv_ctx *ctxp;

	struct lpfc_nvmet_tgtport *tgtp;

	uint32_t status, result;

	uint32_t result;

	unsigned long flags;

	bool released = false;



	ctxp = cmdwqe->context2;

	status = bf_get(lpfc_wcqe_c_status, wcqe);

	result = wcqe->parameter;



	tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private;
@@ -2788,11 +2783,10 @@ lpfc_nvmet_unsol_fcp_abort_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe, 
	struct lpfc_nvmet_rcv_ctx *ctxp;

	struct lpfc_nvmet_tgtport *tgtp;

	unsigned long flags;

	uint32_t status, result;

	uint32_t result;

	bool released = false;



	ctxp = cmdwqe->context2;

	status = bf_get(lpfc_wcqe_c_status, wcqe);

	result = wcqe->parameter;



	if (!ctxp) {
@@ -2869,10 +2863,9 @@ lpfc_nvmet_xmt_ls_abort_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe, 
{

	struct lpfc_nvmet_rcv_ctx *ctxp;

	struct lpfc_nvmet_tgtport *tgtp;

	uint32_t status, result;

	uint32_t result;



	ctxp = cmdwqe->context2;

	status = bf_get(lpfc_wcqe_c_status, wcqe);

	result = wcqe->parameter;



	tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private;
@@ -3227,7 +3220,6 @@ lpfc_nvmet_unsol_ls_issue_abort(struct lpfc_hba *phba, 
{

	struct lpfc_nvmet_tgtport *tgtp;

	struct lpfc_iocbq *abts_wqeq;

	union lpfc_wqe128 *wqe_abts;

	unsigned long flags;

	int rc;
@@ -3257,7 +3249,6 @@ lpfc_nvmet_unsol_ls_issue_abort(struct lpfc_hba *phba, 
		}

	}

	abts_wqeq = ctxp->wqeq;

	wqe_abts = &abts_wqeq->wqe;



	if (lpfc_nvmet_unsol_issue_abort(phba, ctxp, sid, xri) == 0) {

		rc = WQE_BUSY;