summaryrefslogtreecommitdiff
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
authorSergei Shtylyov <sshtylyov@ru.mvista.com>2009-04-08 16:13:03 +0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-04-08 16:13:03 +0400
commit3153c26b54230d025c6d536e8d3015def4524906 (patch)
tree0dc92136480ddfdd2f52a48045446e9ed95ed077 /drivers/ide/ide-probe.c
parentc9ff9e7b64138d87023b733e618f29a1d58543f7 (diff)
downloadlinux-3153c26b54230d025c6d536e8d3015def4524906.tar.xz
ide: refactor tf_read() method
Simplify tf_read() method, making it deal only with 'struct ide_taskfile' and the validity flags that the upper layer passes, and factoring out the code that deals with the high order bytes into ide_tf_readback() to be called from the only two functions interested, ide_complete_cmd() and ide_dump_sector(). This should stop the needless code duplication in this method and so make it about twice smaller than it was; along with simplifying the setup for the method call, this should save both time and space... Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 44d7816c1fe9..7f264ed1141b 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -335,14 +335,11 @@ int ide_busy_sleep(ide_hwif_t *hwif, unsigned long timeout, int altstatus)
static u8 ide_read_device(ide_drive_t *drive)
{
- struct ide_cmd cmd;
+ struct ide_taskfile tf;
- memset(&cmd, 0, sizeof(cmd));
- cmd.valid.in.tf = IDE_VALID_DEVICE;
+ drive->hwif->tp_ops->tf_read(drive, &tf, IDE_VALID_DEVICE);
- drive->hwif->tp_ops->tf_read(drive, &cmd);
-
- return cmd.tf.device;
+ return tf.device;
}
/**