diff options
author | Johannes Thumshirn <jthumshirn@suse.de> | 2016-01-20 10:08:40 -0500 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-02-23 21:27:02 -0500 |
commit | 19db2307365231e798bb99324ed553bcada57913 (patch) | |
tree | 0086276c8468f1217dad9c24ca4eea0b870dc25d /drivers/scsi/lpfc | |
parent | d867b655eadf01fd5231ad9f41010c4d3b002a16 (diff) |
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>
Diffstat (limited to 'drivers/scsi/lpfc')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index 152b3c8a5428..3bd0be6277b3 100644 --- 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, | |||
4139 | /* The sdev is not guaranteed to be valid post scsi_done upcall. */ | 4139 | /* The sdev is not guaranteed to be valid post scsi_done upcall. */ |
4140 | cmd->scsi_done(cmd); | 4140 | cmd->scsi_done(cmd); |
4141 | 4141 | ||
4142 | if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) { | ||
4143 | spin_lock_irqsave(&phba->hbalock, flags); | ||
4144 | lpfc_cmd->pCmd = NULL; | ||
4145 | spin_unlock_irqrestore(&phba->hbalock, flags); | ||
4146 | |||
4147 | /* | ||
4148 | * If there is a thread waiting for command completion | ||
4149 | * wake up the thread. | ||
4150 | */ | ||
4151 | spin_lock_irqsave(shost->host_lock, flags); | ||
4152 | if (lpfc_cmd->waitq) | ||
4153 | wake_up(lpfc_cmd->waitq); | ||
4154 | spin_unlock_irqrestore(shost->host_lock, flags); | ||
4155 | lpfc_release_scsi_buf(phba, lpfc_cmd); | ||
4156 | return; | ||
4157 | } | ||
4158 | |||
4159 | spin_lock_irqsave(&phba->hbalock, flags); | 4142 | spin_lock_irqsave(&phba->hbalock, flags); |
4160 | lpfc_cmd->pCmd = NULL; | 4143 | lpfc_cmd->pCmd = NULL; |
4161 | spin_unlock_irqrestore(&phba->hbalock, flags); | 4144 | spin_unlock_irqrestore(&phba->hbalock, flags); |