[PATCH 08/14] ide: merge task_{in,out}_intr()

Bartlomiej Zolnierkiewicz
2009-02-02T21:38:33Z

Subject: [PATCH] ide: merge task_{in,out}_intr()

* Merge task_out_intr() with task_in_intr().

* Rename task_in_intr() to task_pio_intr().

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ide/ide-taskfile.c | 72 +++++++++++++++++++--------------------------
1 file changed, 31 insertions(+), 41 deletions(-)

Index: b/drivers/ide/ide-taskfile.c
===================================================================
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -55,7 +55,7 @@ int taskfile_lib_get_identify (ide_drive

static ide_startstop_t task_no_data_intr(ide_drive_t *);
static ide_startstop_t pre_task_out_intr(ide_drive_t *, struct ide_cmd *);
-static ide_startstop_t task_in_intr(ide_drive_t *);
+static ide_startstop_t task_pio_intr(ide_drive_t *);

ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)
{
@@ -92,7 +92,7 @@ ide_startstop_t do_rw_taskfile(ide_drive
ndelay(400); /* FIXME */
return pre_task_out_intr(drive, cmd);
}
- handler = task_in_intr;
+ handler = task_pio_intr;
/* fall-through */
case ATA_PROT_NODATA:
if (handler == NULL)
@@ -325,68 +325,57 @@ static ide_startstop_t task_in_unexpecte
}

/* Assume it was a spurious irq */
- ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
+ ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL);
+
return ide_started;
}

/*
- * Handler for command with PIO data-in phase (Read/Read Multiple).
+ * Handler for command with PIO data phase.
*/
-static ide_startstop_t task_in_intr(ide_drive_t *drive)
+static ide_startstop_t task_pio_intr(ide_drive_t *drive)
{
ide_hwif_t *hwif = drive->hwif;
struct ide_cmd *cmd = &drive->hwif->cmd;
u8 stat = hwif->tp_ops->read_status(hwif);
+ u8 write = !!(cmd->tf_flags & IDE_TFLAG_WRITE);

- /* Error? */
- if (stat & ATA_ERR)
- return task_error(drive, cmd, __func__, stat);
-
- /* Didn't want any data? Odd. */
- if ((stat & ATA_DRQ) == 0)
- return task_in_unexpected(drive, cmd, stat);
+ if (write == 0) {
+ /* Error? */
+ if (stat & ATA_ERR)
+ return task_error(drive, cmd, __func__, stat);

- ide_pio_datablock(drive, cmd, 0);
+ /* Didn't want any data? Odd. */
+ if ((stat & ATA_DRQ) == 0)
+ return task_in_unexpected(drive, cmd, stat);
+ } else {
+ if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat))
+ return task_error(drive, cmd, __func__, stat);

- /* Are we done? Check status and finish transfer. */
- if (cmd->nleft == 0) {
- stat = wait_drive_not_busy(drive);
- if (!OK_STAT(stat, 0, BAD_STAT))
+ /* Deal with unexpected ATA data phase. */
+ if (((stat & ATA_DRQ) == 0) ^ (cmd->nleft == 0))
return task_error(drive, cmd, __func__, stat);
+ }
+
+ if (write && cmd->nleft == 0) {
ide_finish_cmd(drive, cmd, stat);
return ide_stopped;
}

/* Still data left to transfer. */
- ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
+ ide_pio_datablock(drive, cmd, write);

- return ide_started;
-}
-
-/*
- * Handler for command with PIO data-out phase (Write/Write Multiple).
- */
-static ide_startstop_t task_out_intr (ide_drive_t *drive)
-{
- ide_hwif_t *hwif = drive->hwif;
- struct ide_cmd *cmd = &drive->hwif->cmd;
- u8 stat = hwif->tp_ops->read_status(hwif);
-
- if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat))
- return task_error(drive, cmd, __func__, stat);
-
- /* Deal with unexpected ATA data phase. */
- if (((stat & ATA_DRQ) == 0) ^ (cmd->nleft == 0))
- return task_error(drive, cmd, __func__, stat);
-
- if (cmd->nleft == 0) {
+ /* Are we done? Check status and finish transfer. */
+ 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;
}

/* Still data left to transfer. */
- ide_pio_datablock(drive, cmd, 1);
- ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL);
+ ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL);

return ide_started;
}
@@ -408,7 +397,8 @@ static ide_startstop_t pre_task_out_intr
if ((drive->dev_flags & IDE_DFLAG_UNMASK) == 0)
local_irq_disable();

- ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL);
+ ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL);
+
ide_pio_datablock(drive, cmd, 1);

return ide_started;