[PATCH 11/14] ide: task_error() -> task_error_cmd()

Bartlomiej Zolnierkiewicz
2009-02-02T21:39:59Z

Subject: [PATCH] ide: task_error() -> task_error_cmd()

* Move ide_error() call from task_error() to task_pio_intr()
(the only user).

* Drop no longer used arguments from task_error().

* Rename task_error() to ide_error_cmd().

There should be no functional changes caused by this patch.

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

Index: b/drivers/ide/ide-taskfile.c
===================================================================
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -276,8 +276,7 @@ static void ide_pio_datablock(ide_drive_
drive->io_32bit = saved_io_32bit;
}

-static ide_startstop_t task_error(ide_drive_t *drive, struct ide_cmd *cmd,
- const char *s, u8 stat)
+static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
{
if (cmd->tf_flags & IDE_TFLAG_FS) {
int sectors = cmd->nsect - cmd->nleft;
@@ -293,7 +292,6 @@ static ide_startstop_t task_error(ide_dr
if (sectors > 0)
ide_end_request(drive, 1, sectors);
}
- return ide_error(drive, s, stat);
}

void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat)
@@ -364,7 +362,8 @@ out_end:
ide_finish_cmd(drive, cmd, stat);
return ide_stopped;
out_err:
- return task_error(drive, cmd, __func__, stat);
+ ide_error_cmd(drive, cmd);
+ return ide_error(drive, __func__, stat);
}

static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,