scsi: lpfc: remove duplicate unloading checks

During code reviews several instances of duplicate module unloading checks
were found.

Remove the duplicate checks.

Link: https://lore.kernel.org/r/20200421203354.49420-1-jsmart2021@gmail.com
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: James Smart <jsmart2021@gmail.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 80d1e66..565a214 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -7936,19 +7936,13 @@ lpfc_els_timeout_handler(struct lpfc_vport *vport)
        if (unlikely(!pring))
                return;
 
-       if ((phba->pport->load_flag & FC_UNLOADING))
+       if (phba->pport->load_flag & FC_UNLOADING)
                return;
+
        spin_lock_irq(&phba->hbalock);
        if (phba->sli_rev == LPFC_SLI_REV4)
                spin_lock(&pring->ring_lock);
 
-       if ((phba->pport->load_flag & FC_UNLOADING)) {
-               if (phba->sli_rev == LPFC_SLI_REV4)
-                       spin_unlock(&pring->ring_lock);
-               spin_unlock_irq(&phba->hbalock);
-               return;
-       }
-
        list_for_each_entry_safe(piocb, tmp_iocb, &pring->txcmplq, list) {
                cmd = &piocb->iocb;
 

diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
index a45936e..12d2b27 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nvme.c
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
@@ -1491,11 +1491,6 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport,
 
        phba = vport->phba;
 
-       if (vport->load_flag & FC_UNLOADING) {
-               ret = -ENODEV;
-               goto out_fail;
-       }
-
        if (unlikely(vport->load_flag & FC_UNLOADING)) {
                lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_IOERR,
                                 "6124 Fail IO, Driver unload\n");

diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c
index 565419b..5f5aece 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nvmet.c
+++ b/drivers/scsi/lpfc/lpfc_nvmet.c
@@ -844,9 +844,6 @@ lpfc_nvmet_xmt_ls_rsp(struct nvmet_fc_target_port *tgtport,
        if (phba->pport->load_flag & FC_UNLOADING)
                return -ENODEV;
 
-       if (phba->pport->load_flag & FC_UNLOADING)
-               return -ENODEV;
-
        lpfc_printf_log(phba, KERN_INFO, LOG_NVME_DISC,
                        "6023 NVMET LS rsp oxid x%x\n", ctxp->oxid);
 
@@ -938,11 +935,6 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport,
                goto aerr;
        }
 
-       if (phba->pport->load_flag & FC_UNLOADING) {
-               rc = -ENODEV;
-               goto aerr;
-       }
-
 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
        if (ctxp->ts_cmd_nvme) {
                if (rsp->op == NVMET_FCOP_RSP)
@@ -1065,9 +1057,6 @@ lpfc_nvmet_xmt_fcp_abort(struct nvmet_fc_target_port *tgtport,
        if (phba->pport->load_flag & FC_UNLOADING)
                return;
 
-       if (phba->pport->load_flag & FC_UNLOADING)
-               return;
-
        if (!ctxp->hdwq)
                ctxp->hdwq = &phba->sli4_hba.hdwq[0];