From: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
Subject: [PATCH] ide: unify exit paths in task_pio_intr()
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
---
'goto' rules!
drivers/ide/ide-taskfile.c | 37 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 20 deletions(-)
Index: b/drivers/ide/ide-taskfile.c
===================================================================
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -322,35 +322,28 @@ static ide_startstop_t task_pio_intr(ide
if (write == 0) {
/* Error? */
if (stat & ATA_ERR)
- return task_error(drive, cmd, __func__, stat);
+ goto out_err;
/* Didn't want any data? Odd. */
if ((stat & ATA_DRQ) == 0) {
/* Command all done? */
- if (OK_STAT(stat, ATA_DRDY, ATA_BUSY)) {
- ide_finish_cmd(drive, cmd, stat);
- return ide_stopped;
- }
+ if (OK_STAT(stat, ATA_DRDY, ATA_BUSY))
+ goto out_end;
/* Assume it was a spurious irq */
- ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE,
- NULL);
-
- return ide_started;
+ goto out_wait;
}
} else {
if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat))
- return task_error(drive, cmd, __func__, stat);
+ goto out_err;
/* Deal with unexpected ATA data phase. */
if (((stat & ATA_DRQ) == 0) ^ (cmd->nleft == 0))
- return task_error(drive, cmd, __func__, stat);
+ goto out_err;
}
- if (write && cmd->nleft == 0) {
- ide_finish_cmd(drive, cmd, stat);
- return ide_stopped;
- }
+ if (write && cmd->nleft == 0)
+ goto out_end;
/* Still data left to transfer. */
ide_pio_datablock(drive, cmd, write);
@@ -359,15 +352,19 @@ static ide_startstop_t task_pio_intr(ide
if (write == 0 && cmd->nleft == 0) {
stat = wait_drive_not_busy(drive);
if (!OK_STAT(stat, 0, BAD_STAT))
- return task_error(drive, cmd, __func__, stat);
- ide_finish_cmd(drive, cmd, stat);
- return ide_stopped;
- }
+ goto out_err;
+ goto out_end;
+ }
+out_wait:
/* Still data left to transfer. */
ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL);
-
return ide_started;
+out_end:
+ ide_finish_cmd(drive, cmd, stat);
+ return ide_stopped;
+out_err:
+ return task_error(drive, cmd, __func__, stat);
}
static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
