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, 8 insertions, 7 deletions

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index c9ef77c5d62e..6857e6aaf20d 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -49,16 +49,17 @@ static void ide_dump_opcode(ide_drive_t *drive)
                 printk(KERN_CONT "0x%02x\n", cmd->tf.command);
 }
 
-u64 ide_get_lba_addr(struct ide_taskfile *tf, int lba48)
+u64 ide_get_lba_addr(struct ide_cmd *cmd, int lba48)
 {
+        struct ide_taskfile *tf = &cmd->tf;
         u32 high, low;
 
-        if (lba48)
-                high = (tf->hob_lbah << 16) | (tf->hob_lbam << 8) |
-                        tf->hob_lbal;
-        else
-                high = tf->device & 0xf;
         low  = (tf->lbah << 16) | (tf->lbam << 8) | tf->lbal;
+        if (lba48) {
+                tf = &cmd->hob;
+                high = (tf->lbah << 16) | (tf->lbam << 8) | tf->lbal;
+        } else
+                high = tf->device & 0xf;
 
         return ((u64)high << 24) | low;
 }
@@ -82,7 +83,7 @@ static void ide_dump_sector(ide_drive_t *drive)
 
         if (lba48 || (tf->device & ATA_LBA))
                 printk(KERN_CONT ", LBAsect=%llu",
-                        (unsigned long long)ide_get_lba_addr(tf, lba48));
+                        (unsigned long long)ide_get_lba_addr(&cmd, lba48));
         else
                 printk(KERN_CONT ", CHS=%d/%d/%d", (tf->lbah << 8) + tf->lbam,
                         tf->device & 0xf, tf->lbal);