scsi: lpfc: Fix set but not used warnings from Rework remote port lock handling

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>

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index cfd95ca698889145979e5cfb44b79fe05b866085..fd5c581cd67a6a3c81aef9801a2b87780f35322a 100644 (file)
--- 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 *vport, uint32_t did, uint8_t retry)
        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 *phba, struct lpfc_sli_ring *pring,
         * 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_hba *phba)
        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;

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index c8911a3d00ee53e6052efc5b8e6180a96351e1a4..44eddddff0dc9869ba73456265383bbf48db84c2 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -84,7 +84,6 @@ lpfc_rport_invalid(struct fc_rport *rport)
 {
        struct lpfc_rport_data *rdata;
        struct lpfc_nodelist *ndlp;
-       struct lpfc_vport *vport;
 
        if (!rport) {
                pr_err("**** %s: NULL rport, exit.\n", __func__);
@@ -105,7 +104,6 @@ lpfc_rport_invalid(struct fc_rport *rport)
                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,
@@ -6195,7 +6193,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) {
@@ -6208,7 +6205,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);

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index f4de75b2f64f7dd8ba057d2f34ae9dd582059fce..f4cf60f125f525d953c272be37c127e1daef08ca 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -5644,7 +5644,6 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba *phba,
        int rc;
        struct lpfc_vport *vport;
        struct lpfc_nodelist *ndlp;
-       struct Scsi_Host  *shost;
        int active_vlink_present;
        struct lpfc_vport **vports;
        int i;
@@ -5825,7 +5824,6 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba *phba,
                         */
                        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);