Commit f1333c48 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

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: default avatarBart Van Assche <bvanassche@acm.org>
Tested-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Reviewed-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 8b21900b

drivers/scsi/qla2xxx/qla_init.c

+5 −7
Original line number Diff line number Diff line
@@ -122,14 +122,12 @@ 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)) {

	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)

{