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, 6 deletions

diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index ea0a9752c6f9..9c47cbf8c506 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -656,9 +656,11 @@ static void scc_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)
-                out_be32((void *)io_ports->data_addr,
-                         (tf->hob_data << 8) | tf->data);
+        if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
+                u8 data[2] = { tf->data, tf->hob_data };
+
+                scc_output_data(drive, NULL, data, 2);
+        }
 
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
                 scc_ide_outb(tf->hob_feature, io_ports->feature_addr);
@@ -693,10 +695,12 @@ static void scc_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 = (u16)in_be32((void *)io_ports->data_addr);
+                u8 data[2];
+
+                scc_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 */