ide: refactor tf_load() method

Simplify tf_load() method, making it deal only with 'struct ide_taskfile' and
the validity flags that the upper layer passes, and moving the code that deals
with the high order bytes into the only function interested, do_rw_taskfile().

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>

1 files changed, 1 insertions, 17 deletions

diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c
index 66c27768e85b..481e221b233d 100644
--- a/drivers/ide/ide-io-std.c
+++ b/drivers/ide/ide-io-std.c
@@ -85,13 +85,11 @@ void ide_dev_select(ide_drive_t *drive)
 }
 EXPORT_SYMBOL_GPL(ide_dev_select);
 
-void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
+void ide_tf_load(ide_drive_t *drive, struct ide_taskfile *tf, u8 valid)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct ide_io_ports *io_ports = &hwif->io_ports;
-        struct ide_taskfile *tf = &cmd->hob;
         void (*tf_outb)(u8 addr, unsigned long port);
-        u8 valid = cmd->valid.out.hob;
         u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
 
         if (mmio)
@@ -109,20 +107,6 @@ void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
                 tf_outb(tf->lbam, io_ports->lbam_addr);
         if (valid & IDE_VALID_LBAH)
                 tf_outb(tf->lbah, io_ports->lbah_addr);
-
-        tf = &cmd->tf;
-        valid = cmd->valid.out.tf;
-
-        if (valid & IDE_VALID_FEATURE)
-                tf_outb(tf->feature, io_ports->feature_addr);
-        if (valid & IDE_VALID_NSECT)
-                tf_outb(tf->nsect, io_ports->nsect_addr);
-        if (valid & IDE_VALID_LBAL)
-                tf_outb(tf->lbal, io_ports->lbal_addr);
-        if (valid & IDE_VALID_LBAM)
-                tf_outb(tf->lbam, io_ports->lbam_addr);
-        if (valid & IDE_VALID_LBAH)
-                tf_outb(tf->lbah, io_ports->lbah_addr);
         if (valid & IDE_VALID_DEVICE)
                 tf_outb(tf->device, io_ports->device_addr);
 }