On 20.1.2016 16:08, Johannes Thumshirn wrote: > 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@xxxxxxx> Reviewed-by: Tomas Henzl <thenzl@xxxxxxxxxx> Tomas > --- > drivers/scsi/lpfc/lpfc_scsi.c | 17 ----------------- > 1 file changed, 17 deletions(-) > > diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c > index 152b3c8..3bd0be6 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, > /* 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); -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html