mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ide: task_error() -> task_error_cmd()

Browse source 
* 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>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2009-03-27 12:46:41 +01:00
parent 0a1248c5a7
commit 041cea10a8
1 changed files with 3 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/ide/ide-taskfile.c
View file

@ -280,8 +280,7 @@ static void ide_pio_datablock(ide_drive_t *drive, struct ide_cmd *cmd,
drive->io_32bit = saved_io_32bit; drive->io_32bit = saved_io_32bit;
} }
static ide_startstop_t task_error(ide_drive_t *drive, struct ide_cmd *cmd, static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
const char *s, u8 stat)
{ {
if (cmd->tf_flags & IDE_TFLAG_FS) { if (cmd->tf_flags & IDE_TFLAG_FS) {
int sectors = cmd->nsect - cmd->nleft; 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) if (sectors > 0)
ide_end_request(drive, 1, sectors); 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) void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat)
@ -368,7 +366,8 @@ static ide_startstop_t task_pio_intr(ide_drive_t *drive)
ide_finish_cmd(drive, cmd, stat); ide_finish_cmd(drive, cmd, stat);
return ide_stopped; return ide_stopped;
out_err: 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, static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,