diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 12:46:41 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 12:46:41 +0100 |
| commit | 041cea10a86a25b088185d07ad15d728f503f02c (patch) | |
| tree | 6d2635fccc8d081eb160069dd29b7365af83f7a8 /drivers/ide | |
| parent | 0a1248c5a754cc8dc5b10a902d2f86b40144165c (diff) | |
| download | linux-041cea10a86a25b088185d07ad15d728f503f02c.tar.gz linux-041cea10a86a25b088185d07ad15d728f503f02c.tar.bz2 linux-041cea10a86a25b088185d07ad15d728f503f02c.zip | |
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>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-taskfile.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 79900a7a62e6..c02687507682 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c @@ -280,8 +280,7 @@ static void ide_pio_datablock(ide_drive_t *drive, struct ide_cmd *cmd, 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; @@ -297,7 +296,6 @@ static ide_startstop_t task_error(ide_drive_t *drive, struct ide_cmd *cmd, 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) @@ -368,7 +366,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, |