ide: call {in|out}put_data() methods from tf_{read|load}() methods (take 2)

Handle IDE_FTFLAG_{IN|OUT}_DATA flags in tf_{read|load}() methods by calling
{in|out}put_data() methods to transfer 2 bytes -- this will allow us to move
that handling out of those methods altogether...

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

1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/ide/ide-h8300.c b/drivers/ide/ide-h8300.c
index 1d45cd5b6a1c..6cb1785d32e6 100644
--- a/drivers/ide/ide-h8300.c
+++ b/drivers/ide/ide-h8300.c
@@ -54,8 +54,11 @@ 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)
-                mm_outw((tf->hob_data << 8) | tf->data, io_ports->data_addr);
+        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);
@@ -91,10 +94,12 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
         struct ide_taskfile *tf = &cmd->tf;
 
         if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
-                u16 data = mm_inw(io_ports->data_addr);
+                u8 data[2];
+
+                h8300_input_data(drive, cmd, data, 2);
 
-                tf->data = data & 0xff;
-                tf->hob_data = (data >> 8) & 0xff;
+                tf->data = data[0];
+                tf->hob_data = data[1];
         }
 
         /* be sure we're looking at the low order bits */