ide: replace IDE_TFLAG_* flags by IDE_VALID_*

Replace IDE_TFLAG_{IN|OUT}_* flags meaning to the taskfile register validity on
input/output by the IDE_VALID_* flags and introduce 4 symmetric 8-bit register
validity indicator subfields, 'valid.{input/output}.{tf|hob}', into the 'struct
ide_cmd' instead of using the 'tf_flags' field for that purpose (this field can
then be turned from 32-bit into 8-bit one).

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 14 insertions, 11 deletions

diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
index 71a39fb3856f..0208dd35c1a3 100644
--- a/drivers/ide/ns87415.c
+++ b/drivers/ide/ns87415.c
@@ -65,35 +65,38 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
 {
         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 */
         outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-        if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
+        if (valid & IDE_VALID_ERROR)
                 tf->error  = inb(io_ports->feature_addr);
-        if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
+        if (valid & IDE_VALID_NSECT)
                 tf->nsect  = inb(io_ports->nsect_addr);
-        if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
+        if (valid & IDE_VALID_LBAL)
                 tf->lbal   = inb(io_ports->lbal_addr);
-        if (cmd->tf_flags & IDE_TFLAG_IN_LBAM)
+        if (valid & IDE_VALID_LBAM)
                 tf->lbam   = inb(io_ports->lbam_addr);
-        if (cmd->tf_flags & IDE_TFLAG_IN_LBAH)
+        if (valid & IDE_VALID_LBAH)
                 tf->lbah   = inb(io_ports->lbah_addr);
-        if (cmd->tf_flags & IDE_TFLAG_IN_DEVICE)
+        if (valid & IDE_VALID_DEVICE)
                 tf->device = superio_ide_inb(io_ports->device_addr);
 
         if (cmd->tf_flags & IDE_TFLAG_LBA48) {
                 outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
+                valid = cmd->valid.in.hob;
+
+                if (valid & IDE_VALID_ERROR)
                         tf->hob_error = inb(io_ports->feature_addr);
-                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
+                if (valid & IDE_VALID_NSECT)
                         tf->hob_nsect = inb(io_ports->nsect_addr);
-                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
+                if (valid & IDE_VALID_LBAL)
                         tf->hob_lbal  = inb(io_ports->lbal_addr);
-                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
+                if (valid & IDE_VALID_LBAM)
                         tf->hob_lbam  = inb(io_ports->lbam_addr);
-                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
+                if (valid & IDE_VALID_LBAH)
                         tf->hob_lbah  = inb(io_ports->lbah_addr);
         }
 }