ide: use IDE I/O helpers directly in ide_tf_{load,read}()

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 56 insertions, 27 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 65275454a20..e981e294307 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -132,8 +132,15 @@ static void ide_tf_load(ide_drive_t *drive, ide_task_t *task)
         ide_hwif_t *hwif = drive->hwif;
         struct ide_io_ports *io_ports = &hwif->io_ports;
         struct ide_taskfile *tf = &task->tf;
+        void (*tf_outb)(u8 addr, unsigned long port);
+        u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
         u8 HIHI = (task->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF;
 
+        if (mmio)
+                tf_outb = ide_mm_outb;
+        else
+                tf_outb = ide_outb;
+
         if (task->tf_flags & IDE_TFLAG_FLAGGED)
                 HIHI = 0xFF;
 
@@ -142,34 +149,40 @@ static void ide_tf_load(ide_drive_t *drive, ide_task_t *task)
         if ((task->tf_flags & IDE_TFLAG_NO_SELECT_MASK) == 0)
                 SELECT_MASK(drive, 0);
 
-        if (task->tf_flags & IDE_TFLAG_OUT_DATA)
-                hwif->OUTW((tf->hob_data << 8) | tf->data, io_ports->data_addr);
+        if (task->tf_flags & IDE_TFLAG_OUT_DATA) {
+                u16 data = (tf->hob_data << 8) | tf->data;
+
+                if (mmio)
+                        writew(data, (void __iomem *)io_ports->data_addr);
+                else
+                        outw(data, io_ports->data_addr);
+        }
 
         if (task->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
-                hwif->OUTB(tf->hob_feature, io_ports->feature_addr);
+                tf_outb(tf->hob_feature, io_ports->feature_addr);
         if (task->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)
-                hwif->OUTB(tf->hob_nsect, io_ports->nsect_addr);
+                tf_outb(tf->hob_nsect, io_ports->nsect_addr);
         if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAL)
-                hwif->OUTB(tf->hob_lbal, io_ports->lbal_addr);
+                tf_outb(tf->hob_lbal, io_ports->lbal_addr);
         if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAM)
-                hwif->OUTB(tf->hob_lbam, io_ports->lbam_addr);
+                tf_outb(tf->hob_lbam, io_ports->lbam_addr);
         if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAH)
-                hwif->OUTB(tf->hob_lbah, io_ports->lbah_addr);
+                tf_outb(tf->hob_lbah, io_ports->lbah_addr);
 
         if (task->tf_flags & IDE_TFLAG_OUT_FEATURE)
-                hwif->OUTB(tf->feature, io_ports->feature_addr);
+                tf_outb(tf->feature, io_ports->feature_addr);
         if (task->tf_flags & IDE_TFLAG_OUT_NSECT)
-                hwif->OUTB(tf->nsect, io_ports->nsect_addr);
+                tf_outb(tf->nsect, io_ports->nsect_addr);
         if (task->tf_flags & IDE_TFLAG_OUT_LBAL)
-                hwif->OUTB(tf->lbal, io_ports->lbal_addr);
+                tf_outb(tf->lbal, io_ports->lbal_addr);
         if (task->tf_flags & IDE_TFLAG_OUT_LBAM)
-                hwif->OUTB(tf->lbam, io_ports->lbam_addr);
+                tf_outb(tf->lbam, io_ports->lbam_addr);
         if (task->tf_flags & IDE_TFLAG_OUT_LBAH)
-                hwif->OUTB(tf->lbah, io_ports->lbah_addr);
+                tf_outb(tf->lbah, io_ports->lbah_addr);
 
         if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)
-                hwif->OUTB((tf->device & HIHI) | drive->select.all,
-                           io_ports->device_addr);
+                tf_outb((tf->device & HIHI) | drive->select.all,
+                         io_ports->device_addr);
 }
 
 static void ide_tf_read(ide_drive_t *drive, ide_task_t *task)
@@ -177,41 +190,57 @@ static void ide_tf_read(ide_drive_t *drive, ide_task_t *task)
         ide_hwif_t *hwif = drive->hwif;
         struct ide_io_ports *io_ports = &hwif->io_ports;
         struct ide_taskfile *tf = &task->tf;
+        void (*tf_outb)(u8 addr, unsigned long port);
+        u8 (*tf_inb)(unsigned long port);
+        u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
+
+        if (mmio) {
+                tf_outb = ide_mm_outb;
+                tf_inb  = ide_mm_inb;
+        } else {
+                tf_outb = ide_outb;
+                tf_inb  = ide_inb;
+        }
 
         if (task->tf_flags & IDE_TFLAG_IN_DATA) {
-                u16 data = hwif->INW(io_ports->data_addr);
+                u16 data;
+
+                if (mmio)
+                        data = readw((void __iomem *)io_ports->data_addr);
+                else
+                        data = inw(io_ports->data_addr);
 
                 tf->data = data & 0xff;
                 tf->hob_data = (data >> 8) & 0xff;
         }
 
         /* be sure we're looking at the low order bits */
-        hwif->OUTB(drive->ctl & ~0x80, io_ports->ctl_addr);
+        tf_outb(drive->ctl & ~0x80, io_ports->ctl_addr);
 
         if (task->tf_flags & IDE_TFLAG_IN_NSECT)
-                tf->nsect  = hwif->INB(io_ports->nsect_addr);
+                tf->nsect  = tf_inb(io_ports->nsect_addr);
         if (task->tf_flags & IDE_TFLAG_IN_LBAL)
-                tf->lbal   = hwif->INB(io_ports->lbal_addr);
+                tf->lbal   = tf_inb(io_ports->lbal_addr);
         if (task->tf_flags & IDE_TFLAG_IN_LBAM)
-                tf->lbam   = hwif->INB(io_ports->lbam_addr);
+                tf->lbam   = tf_inb(io_ports->lbam_addr);
         if (task->tf_flags & IDE_TFLAG_IN_LBAH)
-                tf->lbah   = hwif->INB(io_ports->lbah_addr);
+                tf->lbah   = tf_inb(io_ports->lbah_addr);
         if (task->tf_flags & IDE_TFLAG_IN_DEVICE)
-                tf->device = hwif->INB(io_ports->device_addr);
+                tf->device = tf_inb(io_ports->device_addr);
 
         if (task->tf_flags & IDE_TFLAG_LBA48) {
-                hwif->OUTB(drive->ctl | 0x80, io_ports->ctl_addr);
+                tf_outb(drive->ctl | 0x80, io_ports->ctl_addr);
 
                 if (task->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
-                        tf->hob_feature = hwif->INB(io_ports->feature_addr);
+                        tf->hob_feature = tf_inb(io_ports->feature_addr);
                 if (task->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
-                        tf->hob_nsect   = hwif->INB(io_ports->nsect_addr);
+                        tf->hob_nsect   = tf_inb(io_ports->nsect_addr);
                 if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
-                        tf->hob_lbal    = hwif->INB(io_ports->lbal_addr);
+                        tf->hob_lbal    = tf_inb(io_ports->lbal_addr);
                 if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
-                        tf->hob_lbam    = hwif->INB(io_ports->lbam_addr);
+                        tf->hob_lbam    = tf_inb(io_ports->lbam_addr);
                 if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
-                        tf->hob_lbah    = hwif->INB(io_ports->lbah_addr);
+                        tf->hob_lbah    = tf_inb(io_ports->lbah_addr);
         }
 }