lpfc: Remove redundant code block in lpfc_scsi_cmd_iocb_cmpl

This removes a redundant code block that will either be executed if the
ENABLE_FCP_RING_POLLING flag is set in phba->cfg_poll or not. The code
is just duplicated in both cases, hence we unify it again.

This probably is a left over from some sort of refactoring.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Reviewed-by: Sebastian Herbszt <herbszt@gmx.de>
Acked-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 152b3c8a5428fd522bb514fc3acfeafce31a5572..3bd0be6277b3e0223177b5320ab6352ffd88d649 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -4139,23 +4139,6 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
        /* The sdev is not guaranteed to be valid post scsi_done upcall. */
        cmd->scsi_done(cmd);
 
-       if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) {
-               spin_lock_irqsave(&phba->hbalock, flags);
-               lpfc_cmd->pCmd = NULL;
-               spin_unlock_irqrestore(&phba->hbalock, flags);
-
-               /*
-                * If there is a thread waiting for command completion
-                * wake up the thread.
-                */
-               spin_lock_irqsave(shost->host_lock, flags);
-               if (lpfc_cmd->waitq)
-                       wake_up(lpfc_cmd->waitq);
-               spin_unlock_irqrestore(shost->host_lock, flags);
-               lpfc_release_scsi_buf(phba, lpfc_cmd);
-               return;
-       }
-
        spin_lock_irqsave(&phba->hbalock, flags);
        lpfc_cmd->pCmd = NULL;
        spin_unlock_irqrestore(&phba->hbalock, flags);