diff options
| author |   Bart Van Assche <bvanassche@acm.org> | 2019-08-08 20:02:18 -0700 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2019-08-12 21:34:09 -0400 |
| commit | fe6b52c9adbcce03c549d07c3db06b1694581225 (patch) | |
| tree | ace072a1c10b0a5aa327444da4730011dc9642e8 /drivers/scsi/qla2xxx/qla_init.c | |
| parent | scsi: qla2xxx: Remove two superfluous if-tests (diff) | |
| download | linux-dev-fe6b52c9adbcce03c549d07c3db06b1694581225.tar.xz linux-dev-fe6b52c9adbcce03c549d07c3db06b1694581225.zip | |
scsi: qla2xxx: Simplify qla24xx_async_abort_cmd()
Make the code easier to read by converting 'goto' statements into
'return' statements.
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 '')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index c9cb6856f82e..535dc21ef56e 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -136,7 +136,7 @@ static int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) sp = qla2xxx_get_qpair_sp(cmd_sp->vha, cmd_sp->qpair, cmd_sp->fcport, GFP_ATOMIC); if (!sp) - goto done; + return rval; abt_iocb = &sp->u.iocb_cmd; sp->type = SRB_ABT_CMD; @@ -160,20 +160,18 @@ static int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) cmd_sp->type); rval = qla2x00_start_sp(sp); - if (rval != QLA_SUCCESS) - goto done_free_sp; + if (rval != QLA_SUCCESS) { + sp->free(sp); + return rval; + } if (wait) { wait_for_completion(&abt_iocb->u.abt.comp); rval = abt_iocb->u.abt.comp_status == CS_COMPLETE ? QLA_SUCCESS : QLA_FUNCTION_FAILED; - } else { - goto done; + sp->free(sp); } -done_free_sp: - sp->free(sp); -done: return rval; } |