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>

diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c
index 9dce793..b7be66d 100644 (file)
--- a/drivers/ide/at91_ide.c
+++ b/drivers/ide/at91_ide.c
@@ -196,9 +196,9 @@ static void at91_ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
                HIHI = 0xFF;
 
        if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
-               u16 data = (tf->hob_data << 8) | tf->data;
+               u8 data[2] = { tf->data, tf->hob_data };
 
-               at91_ide_output_data(drive, NULL, &data, 2);
+               at91_ide_output_data(drive, cmd, data, 2);
        }
 
        if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
@@ -234,11 +234,12 @@ static void at91_ide_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;
+               u8 data[2];
 
-               at91_ide_input_data(drive, NULL, &data, 2);
-               tf->data = data & 0xff;
-               tf->hob_data = (data >> 8) & 0xff;
+               at91_ide_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 */

diff --git a/drivers/ide/ide-h8300.c b/drivers/ide/ide-h8300.c
index 1d45cd5..6cb1785 100644 (file)
--- 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 */

diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c
index 96a537d..f06940d 100644 (file)
--- a/drivers/ide/ide-io-std.c
+++ b/drivers/ide/ide-io-std.c
@@ -91,12 +91,9 @@ void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
                HIHI = 0xFF;
 
        if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
-               u16 data = (tf->hob_data << 8) | tf->data;
+               u8 data[2] = { tf->data, tf->hob_data };
 
-               if (mmio)
-                       writew(data, (void __iomem *)io_ports->data_addr);
-               else
-                       outw(data, io_ports->data_addr);
+               ide_output_data(drive, cmd, data, 2);
        }
 
        if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
@@ -145,15 +142,12 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
        }
 
        if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
-               u16 data;
+               u8 data[2];
 
-               if (mmio)
-                       data = readw((void __iomem *)io_ports->data_addr);
-               else
-                       data = inw(io_ports->data_addr);
+               ide_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 */

diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
index 0a6cf74..7d64bc0 100644 (file)
--- a/drivers/ide/ns87415.c
+++ b/drivers/ide/ns87415.c
@@ -67,10 +67,12 @@ static void superio_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 = inw(io_ports->data_addr);
+               u8 data[2];
 
-               tf->data = data & 0xff;
-               tf->hob_data = (data >> 8) & 0xff;
+               ide_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 */

diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index ea0a975..9c47cbf 100644 (file)
--- 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 */

diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index 606c37f..c075464 100644 (file)
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -93,10 +93,9 @@ static void tx4938ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
                HIHI = 0xFF;
 
        if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
-               u16 data = (tf->hob_data << 8) | tf->data;
+               u8 data[2] = { tf->data, tf->hob_data };
 
-               /* no endian swap */
-               __raw_writew(data, (void __iomem *)io_ports->data_addr);
+               hwif->tp_ops->output_data(drive, cmd, data, 2);
        }
 
        if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
@@ -133,12 +132,12 @@ static void tx4938ide_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;
+               u8 data[2];
 
-               /* no endian swap */
-               data = __raw_readw((void __iomem *)io_ports->data_addr);
-               tf->data = data & 0xff;
-               tf->hob_data = (data >> 8) & 0xff;
+               hwif->tp_ops->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 */

diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index f1e9da7..c350d0c 100644 (file)
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -458,10 +458,9 @@ static void tx4939ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
                HIHI = 0xFF;
 
        if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
-               u16 data = (tf->hob_data << 8) | tf->data;
+               u8 data[2] = { tf->data, tf->hob_data };
 
-               /* no endian swap */
-               __raw_writew(data, (void __iomem *)io_ports->data_addr);
+               hwif->tp_ops->output_data(drive, cmd, data, 2);
        }
 
        if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
@@ -500,12 +499,12 @@ static void tx4939ide_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;
+               u8 data[2];
 
-               /* no endian swap */
-               data = __raw_readw((void __iomem *)io_ports->data_addr);
-               tf->data = data & 0xff;
-               tf->hob_data = (data >> 8) & 0xff;
+               hwif->tp_ops->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 */