ide: move data register access out of tf_{read|load}() methods (take 2)

Move IDE_FTFLAG_{IN|OUT}_DATA flag handling out of tf_{read|load}() methods
into the only two functions where these flags actually need to be handled:
do_rw_taskfile() and ide_complete_cmd()...

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

1 files changed, 0 insertions, 15 deletions

diff --git a/drivers/ide/ide-h8300.c b/drivers/ide/ide-h8300.c
index 6cb1785d32e6..8541a9abd7ac 100644
--- a/drivers/ide/ide-h8300.c
+++ b/drivers/ide/ide-h8300.c
@@ -54,12 +54,6 @@ static void h8300_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
         if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)
                 HIHI = 0xFF;
 
-        if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
-                u8 data[2] = { tf->data, tf->hob_data };
-
-                h8300_output_data(drive, cmd, data, 2);
-        }
-
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
                 outb(tf->hob_feature, io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)
@@ -93,15 +87,6 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
         struct ide_io_ports *io_ports = &hwif->io_ports;
         struct ide_taskfile *tf = &cmd->tf;
 
-        if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
-                u8 data[2];
-
-                h8300_input_data(drive, cmd, data, 2);
-
-                tf->data = data[0];
-                tf->hob_data = data[1];
-        }
-
         /* be sure we're looking at the low order bits */
         outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);