ide: move common code out of tf_load() method

Move device register masking (and setting drive->select) out of tf_load() method
and into the only function that needs to use this code, do_rw_taskfile()...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
[bart: fix whitespace error]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c
index 45a424b60c8524698ae74001d43508c33475208a..7950b3bb4312367b3c75cece169fe04012a101a3 100644 (file)
--- a/drivers/ide/ide-io-std.c
+++ b/drivers/ide/ide-io-std.c
@@ -93,16 +93,12 @@ void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
        void (*tf_outb)(u8 addr, unsigned long port);
        u8 valid = cmd->valid.out.hob;
        u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
-       u8 HIHI = (cmd->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF;
 
        if (mmio)
                tf_outb = ide_mm_outb;
        else
                tf_outb = ide_outb;
 
-       if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)
-               HIHI = 0xFF;
-
        if (valid & IDE_VALID_FEATURE)
                tf_outb(tf->feature, io_ports->feature_addr);
        if (valid & IDE_VALID_NSECT)
@@ -127,10 +123,8 @@ 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);
-
        if (valid & IDE_VALID_DEVICE)
-               tf_outb((tf->device & HIHI) | drive->select,
-                        io_ports->device_addr);
+               tf_outb(tf->device, io_ports->device_addr);
 }
 EXPORT_SYMBOL_GPL(ide_tf_load);
 

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 3160be494aa07c73fab63fd78d62e5a663072217..0318a4cb09de6fbcba05f20695807a823f884e57 100644 (file)
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -88,6 +88,16 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)
 
                        tp_ops->output_data(drive, cmd, data, 2);
                }
+
+               if (cmd->valid.out.tf & IDE_VALID_DEVICE) {
+                       u8 HIHI = (cmd->tf_flags & IDE_TFLAG_LBA48) ?
+                                 0xE0 : 0xEF;
+
+                       if (!(cmd->ftf_flags & IDE_FTFLAG_FLAGGED))
+                               cmd->tf.device &= HIHI;
+                       cmd->tf.device |= drive->select;
+               }
+
                tp_ops->tf_load(drive, cmd);
        }
 

diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 1238d5561976c33e0199d39d650e86c51b541473..f5a6fa0a8bea0b162b5b5988a0eb38e7170cb0fe 100644 (file)
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -650,10 +650,6 @@ static void scc_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
        struct ide_io_ports *io_ports = &drive->hwif->io_ports;
        struct ide_taskfile *tf = &cmd->hob;
        u8 valid = cmd->valid.out.hob;
-       u8 HIHI = (cmd->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF;
-
-       if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)
-               HIHI = 0xFF;
 
        if (valid & IDE_VALID_FEATURE)
                scc_ide_outb(tf->feature, io_ports->feature_addr);
@@ -679,10 +675,8 @@ static void scc_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
                scc_ide_outb(tf->lbam, io_ports->lbam_addr);
        if (valid & IDE_VALID_LBAH)
                scc_ide_outb(tf->lbah, io_ports->lbah_addr);
-
        if (valid & IDE_VALID_DEVICE)
-               scc_ide_outb((tf->device & HIHI) | drive->select,
-                            io_ports->device_addr);
+               scc_ide_outb(tf->device, io_ports->device_addr);
 }
 
 static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)