redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

scsi: qla2xxx: Simplify qla24xx_abort_sp_done()

Browse source 
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>
This commit is contained in:
Bart Van Assche 2019-08-08 20:01:39 -07:00 committed by Martin K. Petersen
parent 8b21900b09
commit f1333c48a4
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/scsi/qla2xxx/qla_init.c
View file

@ -122,13 +122,11 @@ static void qla24xx_abort_sp_done(void *ptr, int res)
srb_t *sp = ptr; srb_t *sp = ptr;
struct srb_iocb *abt = &sp->u.iocb_cmd; struct srb_iocb *abt = &sp->u.iocb_cmd;
if ((res == QLA_OS_TIMER_EXPIRED) || del_timer(&sp->u.iocb_cmd.timer);
del_timer(&sp->u.iocb_cmd.timer)) { if (sp->flags & SRB_WAKEUP_ON_COMP)
if (sp->flags & SRB_WAKEUP_ON_COMP) complete(&abt->u.abt.comp);
complete(&abt->u.abt.comp); else
else sp->free(sp);
sp->free(sp);
}
} }
static int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) static int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)