10 files changed, 40 insertions, 101 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index a359323d8ffe..7201b176d75b 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -254,15 +254,13 @@ EXPORT_SYMBOL_GPL(ide_cd_get_xferlen);
 
 void ide_read_bcount_and_ireason(ide_drive_t *drive, u16 *bcount, u8 *ireason)
 {
-        struct ide_cmd cmd;
+        struct ide_taskfile tf;
 
-        memset(&cmd, 0, sizeof(cmd));
-        cmd.valid.in.tf = IDE_VALID_LBAH | IDE_VALID_LBAM | IDE_VALID_NSECT;
+        drive->hwif->tp_ops->tf_read(drive, &tf, IDE_VALID_NSECT |
+                                     IDE_VALID_LBAM | IDE_VALID_LBAH);
 
-        drive->hwif->tp_ops->tf_read(drive, &cmd);
-
-        *bcount = (cmd.tf.lbah << 8) | cmd.tf.lbam;
-        *ireason = cmd.tf.nsect & 3;
+        *bcount = (tf.lbah << 8) | tf.lbam;
+        *ireason = tf.nsect & 3;
 }
 EXPORT_SYMBOL_GPL(ide_read_bcount_and_ireason);
 
@@ -452,14 +450,11 @@ static void ide_init_packet_cmd(struct ide_cmd *cmd, u8 valid_tf,
 
 static u8 ide_read_ireason(ide_drive_t *drive)
 {
-        struct ide_cmd cmd;
-
-        memset(&cmd, 0, sizeof(cmd));
-        cmd.valid.in.tf = IDE_VALID_NSECT;
+        struct ide_taskfile tf;
 
-        drive->hwif->tp_ops->tf_read(drive, &cmd);
+        drive->hwif->tp_ops->tf_read(drive, &tf, IDE_VALID_NSECT);
 
-        return cmd.tf.nsect & 3;
+        return tf.nsect & 3;
 }
 
 static u8 ide_wait_ireason(ide_drive_t *drive, u8 ireason)
diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c
index 481e221b233d..46721c454518 100644
--- a/drivers/ide/ide-io-std.c
+++ b/drivers/ide/ide-io-std.c
@@ -112,13 +112,11 @@ void ide_tf_load(ide_drive_t *drive, struct ide_taskfile *tf, u8 valid)
 }
 EXPORT_SYMBOL_GPL(ide_tf_load);
 
-void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
+void ide_tf_read(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->tf;
         u8 (*tf_inb)(unsigned long port);
-        u8 valid = cmd->valid.in.tf;
         u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
 
         if (mmio)
@@ -126,9 +124,6 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
         else
                 tf_inb  = ide_inb;
 
-        /* be sure we're looking at the low order bits */
-        hwif->tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
-
         if (valid & IDE_VALID_ERROR)
                 tf->error  = tf_inb(io_ports->feature_addr);
         if (valid & IDE_VALID_NSECT)
@@ -141,24 +136,6 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
                 tf->lbah   = tf_inb(io_ports->lbah_addr);
         if (valid & IDE_VALID_DEVICE)
                 tf->device = tf_inb(io_ports->device_addr);
-
-        if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-                hwif->tp_ops->write_devctl(hwif, ATA_HOB | ATA_DEVCTL_OBS);
-
-                tf = &cmd->hob;
-                valid = cmd->valid.in.hob;
-
-                if (valid & IDE_VALID_ERROR)
-                        tf->error = tf_inb(io_ports->feature_addr);
-                if (valid & IDE_VALID_NSECT)
-                        tf->nsect = tf_inb(io_ports->nsect_addr);
-                if (valid & IDE_VALID_LBAL)
-                        tf->lbal  = tf_inb(io_ports->lbal_addr);
-                if (valid & IDE_VALID_LBAM)
-                        tf->lbam  = tf_inb(io_ports->lbam_addr);
-                if (valid & IDE_VALID_LBAH)
-                        tf->lbah  = tf_inb(io_ports->lbah_addr);
-        }
 }
 EXPORT_SYMBOL_GPL(ide_tf_read);
 
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index e71c72be7622..2ae02b8d7f8e 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -90,7 +90,7 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
                 cmd->hob.data = data[1];
         }
 
-        tp_ops->tf_read(drive, cmd);
+        ide_tf_readback(drive, cmd);
 
         if ((cmd->tf_flags & IDE_TFLAG_CUSTOM_HANDLER) &&
             tf_cmd == ATA_CMD_IDLEIMMEDIATE) {
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 6f1ed427a484..c19a221b1e18 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -37,14 +37,11 @@ void SELECT_MASK(ide_drive_t *drive, int mask)
 
 u8 ide_read_error(ide_drive_t *drive)
 {
-        struct ide_cmd cmd;
-
-        memset(&cmd, 0, sizeof(cmd));
-        cmd.valid.in.tf = IDE_VALID_ERROR;
+        struct ide_taskfile tf;
 
-        drive->hwif->tp_ops->tf_read(drive, &cmd);
+        drive->hwif->tp_ops->tf_read(drive, &tf, IDE_VALID_ERROR);
 
-        return cmd.tf.error;
+        return tf.error;
 }
 EXPORT_SYMBOL_GPL(ide_read_error);
 
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 6857e6aaf20d..56ff8c46c7d1 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -79,7 +79,7 @@ static void ide_dump_sector(ide_drive_t *drive)
         } else
                 cmd.valid.in.tf  = IDE_VALID_LBA | IDE_VALID_DEVICE;
 
-        drive->hwif->tp_ops->tf_read(drive, &cmd);
+        ide_tf_readback(drive, &cmd);
 
         if (lba48 || (tf->device & ATA_LBA))
                 printk(KERN_CONT ", LBAsect=%llu",
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;
 }
 
 /**
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index b1806ed46175..4aa6223c11be 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -23,6 +23,23 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
+void ide_tf_readback(ide_drive_t *drive, struct ide_cmd *cmd)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        const struct ide_tp_ops *tp_ops = hwif->tp_ops;
+
+        /* Be sure we're looking at the low order bytes */
+        tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
+
+        tp_ops->tf_read(drive, &cmd->tf, cmd->valid.in.tf);
+
+        if (cmd->tf_flags & IDE_TFLAG_LBA48) {
+                tp_ops->write_devctl(hwif, ATA_HOB | ATA_DEVCTL_OBS);
+
+                tp_ops->tf_read(drive, &cmd->hob, cmd->valid.in.hob);
+        }
+}
+
 void ide_tf_dump(const char *s, struct ide_cmd *cmd)
 {
 #ifdef DEBUG
diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
index f1305f4d2be7..95327a2c2422 100644
--- a/drivers/ide/ns87415.c
+++ b/drivers/ide/ns87415.c
@@ -61,14 +61,10 @@ static u8 superio_dma_sff_read_status(ide_hwif_t *hwif)
         return superio_ide_inb(hwif->dma_base + ATA_DMA_STATUS);
 }
 
-static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
+static void superio_tf_read(ide_drive_t *drive, struct ide_taskfile *tf,
+                            u8 valid)
 {
         struct ide_io_ports *io_ports = &drive->hwif->io_ports;
-        struct ide_taskfile *tf = &cmd->tf;
-        u8 valid = cmd->valid.in.tf;
-
-        /* be sure we're looking at the low order bits */
-        ide_write_devctl(hwif, ATA_DEVCTL_OBS);
 
         if (valid & IDE_VALID_ERROR)
                 tf->error  = inb(io_ports->feature_addr);
@@ -82,24 +78,6 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
                 tf->lbah   = inb(io_ports->lbah_addr);
         if (valid & IDE_VALID_DEVICE)
                 tf->device = superio_ide_inb(io_ports->device_addr);
-
-        if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-                ide_write_devctl(hwif, ATA_HOB | ATA_DEVCTL_OBS);
-
-                tf = &cmd->hob;
-                valid = cmd->valid.in.hob;
-
-                if (valid & IDE_VALID_ERROR)
-                        tf->error = inb(io_ports->feature_addr);
-                if (valid & IDE_VALID_NSECT)
-                        tf->nsect = inb(io_ports->nsect_addr);
-                if (valid & IDE_VALID_LBAL)
-                        tf->lbal  = inb(io_ports->lbal_addr);
-                if (valid & IDE_VALID_LBAM)
-                        tf->lbam  = inb(io_ports->lbam_addr);
-                if (valid & IDE_VALID_LBAH)
-                        tf->lbah  = inb(io_ports->lbah_addr);
-        }
 }
 
 static void ns87415_dev_select(ide_drive_t *drive);
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 5ecb70cf29dc..5be41f25204f 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -663,14 +663,9 @@ static void scc_tf_load(ide_drive_t *drive, struct ide_taskfile *tf, u8 valid)
                 scc_ide_outb(tf->device, io_ports->device_addr);
 }
 
-static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
+static void scc_tf_read(ide_drive_t *drive, struct ide_taskfile *tf, u8 valid)
 {
         struct ide_io_ports *io_ports = &drive->hwif->io_ports;
-        struct ide_taskfile *tf = &cmd->tf;
-        u8 valid = cmd->valid.in.tf;
-
-        /* be sure we're looking at the low order bits */
-        scc_write_devctl(hwif, ATA_DEVCTL_OBS);
 
         if (valid & IDE_VALID_ERROR)
                 tf->error  = scc_ide_inb(io_ports->feature_addr);
@@ -684,24 +679,6 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
                 tf->lbah   = scc_ide_inb(io_ports->lbah_addr);
         if (valid & IDE_VALID_DEVICE)
                 tf->device = scc_ide_inb(io_ports->device_addr);
-
-        if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-                scc_write_devctl(hwif, ATA_HOB | ATA_DEVCTL_OBS);
-
-                tf = &cmd->hob;
-                valid = cmd->valid.in.hob;
-
-                if (valid & IDE_VALID_ERROR)
-                        tf->error = scc_ide_inb(io_ports->feature_addr);
-                if (valid & IDE_VALID_NSECT)
-                        tf->nsect = scc_ide_inb(io_ports->nsect_addr);
-                if (valid & IDE_VALID_LBAL)
-                        tf->lbal  = scc_ide_inb(io_ports->lbal_addr);
-                if (valid & IDE_VALID_LBAM)
-                        tf->lbam  = scc_ide_inb(io_ports->lbam_addr);
-                if (valid & IDE_VALID_LBAH)
-                        tf->lbah  = scc_ide_inb(io_ports->lbah_addr);
-        }
 }
 
 static void scc_input_data(ide_drive_t *drive, struct ide_cmd *cmd,
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 0ba1c6ab97f8..ff65fffb078f 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -625,7 +625,7 @@ struct ide_tp_ops {
 
         void    (*dev_select)(ide_drive_t *);
         void    (*tf_load)(ide_drive_t *, struct ide_taskfile *, u8);
-        void    (*tf_read)(ide_drive_t *, struct ide_cmd *);
+        void    (*tf_read)(ide_drive_t *, struct ide_taskfile *, u8);
 
         void    (*input_data)(ide_drive_t *, struct ide_cmd *,
                               void *, unsigned int);
@@ -1124,6 +1124,7 @@ extern int ide_devset_execute(ide_drive_t *drive,
 void ide_complete_cmd(ide_drive_t *, struct ide_cmd *, u8, u8);
 int ide_complete_rq(ide_drive_t *, int, unsigned int);
 
+void ide_tf_readback(ide_drive_t *drive, struct ide_cmd *cmd);
 void ide_tf_dump(const char *, struct ide_cmd *);
 
 void ide_exec_command(ide_hwif_t *, u8);
@@ -1133,7 +1134,7 @@ void ide_write_devctl(ide_hwif_t *, u8);
 
 void ide_dev_select(ide_drive_t *);
 void ide_tf_load(ide_drive_t *, struct ide_taskfile *, u8);
-void ide_tf_read(ide_drive_t *, struct ide_cmd *);
+void ide_tf_read(ide_drive_t *, struct ide_taskfile *, u8);
 
 void ide_input_data(ide_drive_t *, struct ide_cmd *, void *, unsigned int);
 void ide_output_data(ide_drive_t *, struct ide_cmd *, void *, unsigned int);