1 files changed, 50 insertions, 36 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index e77cee0e5d65..45944219eea0 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -158,9 +158,12 @@ EXPORT_SYMBOL(default_hwif_mmiops);
 
 void SELECT_DRIVE (ide_drive_t *drive)
 {
-        if (HWIF(drive)->selectproc)
-                HWIF(drive)->selectproc(drive);
-        HWIF(drive)->OUTB(drive->select.all, IDE_SELECT_REG);
+        ide_hwif_t *hwif = drive->hwif;
+
+        if (hwif->selectproc)
+                hwif->selectproc(drive);
+
+        hwif->OUTB(drive->select.all, hwif->io_ports[IDE_SELECT_OFFSET]);
 }
 
 void SELECT_MASK (ide_drive_t *drive, int mask)
@@ -194,15 +197,18 @@ static void ata_input_data(ide_drive_t *drive, void *buffer, u32 wcount)
         if (io_32bit) {
                 if (io_32bit & 2) {
                         unsigned long flags;
+
                         local_irq_save(flags);
-                        ata_vlb_sync(drive, IDE_NSECTOR_REG);
-                        hwif->INSL(IDE_DATA_REG, buffer, wcount);
+                        ata_vlb_sync(drive, hwif->io_ports[IDE_NSECTOR_OFFSET]);
+                        hwif->INSL(hwif->io_ports[IDE_DATA_OFFSET], buffer,
+                                   wcount);
                         local_irq_restore(flags);
                 } else
-                        hwif->INSL(IDE_DATA_REG, buffer, wcount);
-        } else {
-                hwif->INSW(IDE_DATA_REG, buffer, wcount<<1);
-        }
+                        hwif->INSL(hwif->io_ports[IDE_DATA_OFFSET], buffer,
+                                   wcount);
+        } else
+                hwif->INSW(hwif->io_ports[IDE_DATA_OFFSET], buffer,
+                           wcount << 1);
 }
 
 /*
@@ -216,15 +222,18 @@ static void ata_output_data(ide_drive_t *drive, void *buffer, u32 wcount)
         if (io_32bit) {
                 if (io_32bit & 2) {
                         unsigned long flags;
+
                         local_irq_save(flags);
-                        ata_vlb_sync(drive, IDE_NSECTOR_REG);
-                        hwif->OUTSL(IDE_DATA_REG, buffer, wcount);
+                        ata_vlb_sync(drive, hwif->io_ports[IDE_NSECTOR_OFFSET]);
+                        hwif->OUTSL(hwif->io_ports[IDE_DATA_OFFSET], buffer,
+                                    wcount);
                         local_irq_restore(flags);
                 } else
-                        hwif->OUTSL(IDE_DATA_REG, buffer, wcount);
-        } else {
-                hwif->OUTSW(IDE_DATA_REG, buffer, wcount<<1);
-        }
+                        hwif->OUTSL(hwif->io_ports[IDE_DATA_OFFSET], buffer,
+                                    wcount);
+        } else
+                hwif->OUTSW(hwif->io_ports[IDE_DATA_OFFSET], buffer,
+                            wcount << 1);
 }
 
 /*
@@ -243,13 +252,15 @@ static void atapi_input_bytes(ide_drive_t *drive, void *buffer, u32 bytecount)
 #if defined(CONFIG_ATARI) || defined(CONFIG_Q40)
         if (MACH_IS_ATARI || MACH_IS_Q40) {
                 /* Atari has a byte-swapped IDE interface */
-                insw_swapw(IDE_DATA_REG, buffer, bytecount / 2);
+                insw_swapw(hwif->io_ports[IDE_DATA_OFFSET], buffer,
+                           bytecount / 2);
                 return;
         }
 #endif /* CONFIG_ATARI || CONFIG_Q40 */
         hwif->ata_input_data(drive, buffer, bytecount / 4);
         if ((bytecount & 0x03) >= 2)
-                hwif->INSW(IDE_DATA_REG, ((u8 *)buffer)+(bytecount & ~0x03), 1);
+                hwif->INSW(hwif->io_ports[IDE_DATA_OFFSET],
+                           (u8 *)buffer + (bytecount & ~0x03), 1);
 }
 
 static void atapi_output_bytes(ide_drive_t *drive, void *buffer, u32 bytecount)
@@ -260,13 +271,15 @@ static void atapi_output_bytes(ide_drive_t *drive, void *buffer, u32 bytecount)
 #if defined(CONFIG_ATARI) || defined(CONFIG_Q40)
         if (MACH_IS_ATARI || MACH_IS_Q40) {
                 /* Atari has a byte-swapped IDE interface */
-                outsw_swapw(IDE_DATA_REG, buffer, bytecount / 2);
+                outsw_swapw(hwif->io_ports[IDE_DATA_OFFSET], buffer,
+                            bytecount / 2);
                 return;
         }
 #endif /* CONFIG_ATARI || CONFIG_Q40 */
         hwif->ata_output_data(drive, buffer, bytecount / 4);
         if ((bytecount & 0x03) >= 2)
-                hwif->OUTSW(IDE_DATA_REG, ((u8*)buffer)+(bytecount & ~0x03), 1);
+                hwif->OUTSW(hwif->io_ports[IDE_DATA_OFFSET],
+                            (u8 *)buffer + (bytecount & ~0x03), 1);
 }
 
 void default_hwif_transport(ide_hwif_t *hwif)
@@ -429,7 +442,7 @@ int drive_is_ready (ide_drive_t *drive)
          * an interrupt with another pci card/device.  We make no assumptions
          * about possible isa-pnp and pci-pnp issues yet.
          */
-        if (IDE_CONTROL_REG)
+        if (hwif->io_ports[IDE_CONTROL_OFFSET])
                 stat = ide_read_altstatus(drive);
         else
                 /* Note: this may clear a pending IRQ!! */
@@ -631,7 +644,7 @@ int ide_driveid_update(ide_drive_t *drive)
         SELECT_MASK(drive, 1);
         ide_set_irq(drive, 1);
         msleep(50);
-        hwif->OUTB(WIN_IDENTIFY, IDE_COMMAND_REG);
+        hwif->OUTB(WIN_IDENTIFY, hwif->io_ports[IDE_COMMAND_OFFSET]);
         timeout = jiffies + WAIT_WORSTCASE;
         do {
                 if (time_after(jiffies, timeout)) {
@@ -718,9 +731,10 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
         SELECT_MASK(drive, 0);
         udelay(1);
         ide_set_irq(drive, 0);
-        hwif->OUTB(speed, IDE_NSECTOR_REG);
-        hwif->OUTB(SETFEATURES_XFER, IDE_FEATURE_REG);
-        hwif->OUTBSYNC(drive, WIN_SETFEATURES, IDE_COMMAND_REG);
+        hwif->OUTB(speed, hwif->io_ports[IDE_NSECTOR_OFFSET]);
+        hwif->OUTB(SETFEATURES_XFER, hwif->io_ports[IDE_FEATURE_OFFSET]);
+        hwif->OUTBSYNC(drive, WIN_SETFEATURES,
+                       hwif->io_ports[IDE_COMMAND_OFFSET]);
         if (drive->quirk_list == 2)
                 ide_set_irq(drive, 1);
 
@@ -828,7 +842,7 @@ void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler,
 
         spin_lock_irqsave(&ide_lock, flags);
         __ide_set_handler(drive, handler, timeout, expiry);
-        hwif->OUTBSYNC(drive, cmd, IDE_COMMAND_REG);
+        hwif->OUTBSYNC(drive, cmd, hwif->io_ports[IDE_COMMAND_OFFSET]);
         /*
          * Drive takes 400nS to respond, we must avoid the IRQ being
          * serviced before that.
@@ -1009,7 +1023,8 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
         unsigned long flags;
         ide_hwif_t *hwif;
         ide_hwgroup_t *hwgroup;
-        
+        u8 ctl;
+
         spin_lock_irqsave(&ide_lock, flags);
         hwif = HWIF(drive);
         hwgroup = HWGROUP(drive);
@@ -1023,7 +1038,8 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
                 pre_reset(drive);
                 SELECT_DRIVE(drive);
                 udelay (20);
-                hwif->OUTBSYNC(drive, WIN_SRST, IDE_COMMAND_REG);
+                hwif->OUTBSYNC(drive, WIN_SRST,
+                               hwif->io_ports[IDE_COMMAND_OFFSET]);
                 ndelay(400);
                 hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE;
                 hwgroup->polling = 1;
@@ -1039,7 +1055,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
         for (unit = 0; unit < MAX_DRIVES; ++unit)
                 pre_reset(&hwif->drives[unit]);
 
-        if (!IDE_CONTROL_REG) {
+        if (hwif->io_ports[IDE_CONTROL_OFFSET] == 0) {
                 spin_unlock_irqrestore(&ide_lock, flags);
                 return ide_stopped;
         }
@@ -1054,16 +1070,14 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
          * recover from reset very quickly, saving us the first 50ms wait time.
          */
         /* set SRST and nIEN */
-        hwif->OUTBSYNC(drive, drive->ctl|6,IDE_CONTROL_REG);
+        hwif->OUTBSYNC(drive, drive->ctl|6, hwif->io_ports[IDE_CONTROL_OFFSET]);
         /* more than enough time */
         udelay(10);
-        if (drive->quirk_list == 2) {
-                /* clear SRST and nIEN */
-                hwif->OUTBSYNC(drive, drive->ctl, IDE_CONTROL_REG);
-        } else {
-                /* clear SRST, leave nIEN */
-                hwif->OUTBSYNC(drive, drive->ctl|2, IDE_CONTROL_REG);
-        }
+        if (drive->quirk_list == 2)
+                ctl = drive->ctl;       /* clear SRST and nIEN */
+        else
+                ctl = drive->ctl | 2;   /* clear SRST, leave nIEN */
+        hwif->OUTBSYNC(drive, ctl, hwif->io_ports[IDE_CONTROL_OFFSET]);
         /* more than enough time */
         udelay(10);
         hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE;