ide: simplify 'struct ide_taskfile'

Make 'struct ide_taskfile' cover only 8 register values and thus put two such
fields ('tf' and 'hob') into 'struct ide_cmd', dropping unnecessary 'tf_array'
field from it.

This required changing the prototype of ide_get_lba_addr() and ide_tf_dump().

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
[bart: fix setting of ATA_LBA bit for LBA48 commands in __ide_do_rw_disk()]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 13 insertions, 11 deletions

diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c
index 8b0b2e9ccf5b..45a424b60c85 100644
--- a/drivers/ide/ide-io-std.c
+++ b/drivers/ide/ide-io-std.c
@@ -89,7 +89,7 @@ void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct ide_io_ports *io_ports = &hwif->io_ports;
-        struct ide_taskfile *tf = &cmd->tf;
+        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;
@@ -104,16 +104,17 @@ void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
                 HIHI = 0xFF;
 
         if (valid & IDE_VALID_FEATURE)
-                tf_outb(tf->hob_feature, io_ports->feature_addr);
+                tf_outb(tf->feature, io_ports->feature_addr);
         if (valid & IDE_VALID_NSECT)
-                tf_outb(tf->hob_nsect, io_ports->nsect_addr);
+                tf_outb(tf->nsect, io_ports->nsect_addr);
         if (valid & IDE_VALID_LBAL)
-                tf_outb(tf->hob_lbal, io_ports->lbal_addr);
+                tf_outb(tf->lbal, io_ports->lbal_addr);
         if (valid & IDE_VALID_LBAM)
-                tf_outb(tf->hob_lbam, io_ports->lbam_addr);
+                tf_outb(tf->lbam, io_ports->lbam_addr);
         if (valid & IDE_VALID_LBAH)
-                tf_outb(tf->hob_lbah, io_ports->lbah_addr);
+                tf_outb(tf->lbah, io_ports->lbah_addr);
 
+        tf = &cmd->tf;
         valid = cmd->valid.out.tf;
 
         if (valid & IDE_VALID_FEATURE)
@@ -170,18 +171,19 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
         if (cmd->tf_flags & IDE_TFLAG_LBA48) {
                 tf_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
+                tf = &cmd->hob;
                 valid = cmd->valid.in.hob;
 
                 if (valid & IDE_VALID_ERROR)
-                        tf->hob_error = tf_inb(io_ports->feature_addr);
+                        tf->error = tf_inb(io_ports->feature_addr);
                 if (valid & IDE_VALID_NSECT)
-                        tf->hob_nsect = tf_inb(io_ports->nsect_addr);
+                        tf->nsect = tf_inb(io_ports->nsect_addr);
                 if (valid & IDE_VALID_LBAL)
-                        tf->hob_lbal  = tf_inb(io_ports->lbal_addr);
+                        tf->lbal  = tf_inb(io_ports->lbal_addr);
                 if (valid & IDE_VALID_LBAM)
-                        tf->hob_lbam  = tf_inb(io_ports->lbam_addr);
+                        tf->lbam  = tf_inb(io_ports->lbam_addr);
                 if (valid & IDE_VALID_LBAH)
-                        tf->hob_lbah  = tf_inb(io_ports->lbah_addr);
+                        tf->lbah  = tf_inb(io_ports->lbah_addr);
         }
 }
 EXPORT_SYMBOL_GPL(ide_tf_read);