diff options
| author |   Bart Van Assche <bvanassche@acm.org> | 2019-08-08 20:01:39 -0700 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2019-08-12 21:34:06 -0400 |
| commit | f1333c48a4ad472683fedae075d2dab6aa8c0273 (patch) | |
| tree | 67769e6648e493ba997c3461bcb6b4bb736c754a /drivers/scsi/qla2xxx | |
| parent | scsi: qla2xxx: Remove two superfluous tests (diff) | |
| download | linux-dev-f1333c48a4ad472683fedae075d2dab6aa8c0273.tar.xz linux-dev-f1333c48a4ad472683fedae075d2dab6aa8c0273.zip | |
scsi: qla2xxx: Simplify qla24xx_abort_sp_done()
Instead of explicitly checking whether a timeout has occurred, ignore the
del_timer() return value.
Cc: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Tested-by: Himanshu Madhani <hmadhani@marvell.com>
Reviewed-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/qla2xxx')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index c24d7667d3c9..cab5f2f90714 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -122,13 +122,11 @@ static void qla24xx_abort_sp_done(void *ptr, int res) srb_t *sp = ptr; struct srb_iocb *abt = &sp->u.iocb_cmd; - if ((res == QLA_OS_TIMER_EXPIRED) || - del_timer(&sp->u.iocb_cmd.timer)) { - if (sp->flags & SRB_WAKEUP_ON_COMP) - complete(&abt->u.abt.comp); - else - sp->free(sp); - } + del_timer(&sp->u.iocb_cmd.timer); + if (sp->flags & SRB_WAKEUP_ON_COMP) + complete(&abt->u.abt.comp); + else + sp->free(sp); } static int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) |