From: James Smart <james.smart@broadcom.com>
Date: Thu, 19 Nov 2020 12:33:40 -0800
Subject: scsi: lpfc: Fix set but not used warnings from Rework remote port
lock handling
Patch-mainline: v5.11-rc1
Git-commit: 4a119d8a4c6058d445db89c22db87ef8316c4286
References: bsc#1164780
Remove local variables that are set but not used.
Link: https://lore.kernel.org/r/20201119203340.121819-1-james.smart@broadcom.com
Fixes: c6adba150191 ("scsi: lpfc: Rework remote port lock handling")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: Daniel Wagner <dwagner@suse.de>
---
drivers/scsi/lpfc/lpfc_els.c | 6 ------
drivers/scsi/lpfc/lpfc_hbadisc.c | 4 ----
drivers/scsi/lpfc/lpfc_init.c | 2 --
3 files changed, 12 deletions(-)
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -2075,7 +2075,6 @@ int
lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry)
{
struct lpfc_hba *phba = vport->phba;
- struct Scsi_Host *shost;
struct serv_parm *sp;
struct lpfc_nodelist *ndlp;
struct lpfc_iocbq *elsiocb;
@@ -2113,7 +2112,6 @@ lpfc_issue_els_plogi(struct lpfc_vport *
if (!elsiocb)
return 1;
- shost = lpfc_shost_from_vport(vport);
spin_lock_irq(&ndlp->lock);
ndlp->nlp_flag &= ~NLP_FCP_PRLI_RJT;
spin_unlock_irq(&ndlp->lock);
@@ -8574,7 +8572,6 @@ static void
lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
struct lpfc_vport *vport, struct lpfc_iocbq *elsiocb)
{
- struct Scsi_Host *shost;
struct lpfc_nodelist *ndlp;
struct ls_rjt stat;
uint32_t *payload, payload_len;
@@ -8635,7 +8632,6 @@ lpfc_els_unsol_buffer(struct lpfc_hba *p
* Do not process any unsolicited ELS commands
* if the ndlp is in DEV_LOSS
*/
- shost = lpfc_shost_from_vport(vport);
spin_lock_irq(&ndlp->lock);
if (ndlp->nlp_flag & NLP_IN_DEV_LOSS) {
spin_unlock_irq(&ndlp->lock);
@@ -9405,7 +9401,6 @@ void
lpfc_retry_pport_discovery(struct lpfc_hba *phba)
{
struct lpfc_nodelist *ndlp;
- struct Scsi_Host *shost;
/* Cancel the all vports retry delay retry timers */
lpfc_cancel_all_vport_retry_delay_timer(phba);
@@ -9415,7 +9410,6 @@ lpfc_retry_pport_discovery(struct lpfc_h
if (!ndlp)
return;
- shost = lpfc_shost_from_vport(phba->pport);
mod_timer(&ndlp->nlp_delayfunc, jiffies + msecs_to_jiffies(1000));
spin_lock_irq(&ndlp->lock);
ndlp->nlp_flag |= NLP_DELAY_TMO;
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -86,7 +86,6 @@ lpfc_rport_invalid(struct fc_rport *rpor
{
struct lpfc_rport_data *rdata;
struct lpfc_nodelist *ndlp;
- struct lpfc_vport *vport;
if (!rport) {
pr_err("**** %s: NULL rport, exit.\n", __func__);
@@ -107,7 +106,6 @@ lpfc_rport_invalid(struct fc_rport *rpor
return -EINVAL;
}
- vport = ndlp->vport;
if (!ndlp->vport) {
pr_err("**** %s: Null vport on ndlp %p, DID x%x rport %p "
"SID x%x\n", __func__, ndlp, ndlp->nlp_DID, rport,
@@ -6191,7 +6189,6 @@ lpfc_nlp_release(struct kref *kref)
struct lpfc_nodelist *
lpfc_nlp_get(struct lpfc_nodelist *ndlp)
{
- struct lpfc_hba *phba;
unsigned long flags;
if (ndlp) {
@@ -6204,7 +6201,6 @@ lpfc_nlp_get(struct lpfc_nodelist *ndlp)
* ndlp reference count that is in the process of being
* released.
*/
- phba = ndlp->phba;
spin_lock_irqsave(&ndlp->lock, flags);
if (!kref_get_unless_zero(&ndlp->kref)) {
spin_unlock_irqrestore(&ndlp->lock, flags);
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -5648,7 +5648,6 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba
int rc;
struct lpfc_vport *vport;
struct lpfc_nodelist *ndlp;
- struct Scsi_Host *shost;
int active_vlink_present;
struct lpfc_vport **vports;
int i;
@@ -5829,7 +5828,6 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba
*/
mod_timer(&ndlp->nlp_delayfunc,
jiffies + msecs_to_jiffies(1000));
- shost = lpfc_shost_from_vport(vport);
spin_lock_irq(&ndlp->lock);
ndlp->nlp_flag |= NLP_DELAY_TMO;
spin_unlock_irq(&ndlp->lock);