ide: remove IDE_*_REG macros

* Add IDE_{ALTSTATUS,IREASON,BCOUNTL,BCOUNTH}_OFFSET defines.

* Remove IDE_*_REG macros - this results in more readable
  and slightly smaller code.

There should be no functional changes caused by this patch.

Cc: Borislav Petkov <petkovbb@gmail.com>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

3 files changed, 14 insertions, 13 deletions

diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index d03a231d965e..82d0e318a1fe 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -760,7 +760,7 @@ static void hpt3xx_maskproc(ide_drive_t *drive, int mask)
                 }
         } else
                 outb(mask ? (drive->ctl | 2) : (drive->ctl & ~2),
-                     IDE_CONTROL_REG);
+                     hwif->io_ports[IDE_CONTROL_OFFSET]);
 }
 
 /*
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 1a560dc1eac1..ef07c7a8b97a 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -334,7 +334,8 @@ static int scc_ide_dma_end(ide_drive_t * drive)
 
         /* errata A308 workaround: Step5 (check data loss) */
         /* We don't check non ide_disk because it is limited to UDMA4 */
-        if (!(in_be32((void __iomem *)IDE_ALTSTATUS_REG) & ERR_STAT) &&
+        if (!(in_be32((void __iomem *)hwif->io_ports[IDE_ALTSTATUS_OFFSET])
+              & ERR_STAT) &&
             drive->media == ide_disk && drive->current_speed > XFER_UDMA_4) {
                 reg = in_be32((void __iomem *)intsts_port);
                 if (!(reg & INTSTS_ACTEINT)) {
@@ -437,7 +438,8 @@ static int scc_dma_test_irq(ide_drive_t *drive)
         u32 int_stat = in_be32((void __iomem *)hwif->dma_base + 0x014);
 
         /* SCC errata A252,A308 workaround: Step4 */
-        if ((in_be32((void __iomem *)IDE_ALTSTATUS_REG) & ERR_STAT) &&
+        if ((in_be32((void __iomem *)hwif->io_ports[IDE_ALTSTATUS_OFFSET])
+             & ERR_STAT) &&
             (int_stat & INTSTS_INTRQ))
                 return 1;
 
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 9046a69117ff..9d1a3038af9b 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -112,10 +112,9 @@ static void
 sgiioc4_maskproc(ide_drive_t * drive, int mask)
 {
         writeb(mask ? (drive->ctl | 2) : (drive->ctl & ~2),
-               (void __iomem *)IDE_CONTROL_REG);
+               (void __iomem *)drive->hwif->io_ports[IDE_CONTROL_OFFSET]);
 }
 
-
 static int
 sgiioc4_checkirq(ide_hwif_t * hwif)
 {
@@ -142,18 +141,18 @@ sgiioc4_clearirq(ide_drive_t * drive)
         intr_reg = readl((void __iomem *)other_ir);
         if (intr_reg & 0x03) { /* Valid IOC4-IDE interrupt */
                 /*
-                 * Using sgiioc4_INB to read the IDE_STATUS_REG has a side effect
-                 * of clearing the interrupt.  The first read should clear it
-                 * if it is set.  The second read should return a "clear" status
-                 * if it got cleared.  If not, then spin for a bit trying to
-                 * clear it.
+                 * Using sgiioc4_INB to read the Status register has a side
+                 * effect of clearing the interrupt.  The first read should
+                 * clear it if it is set.  The second read should return
+                 * a "clear" status if it got cleared.  If not, then spin
+                 * for a bit trying to clear it.
                  */
-                u8 stat = sgiioc4_INB(IDE_STATUS_REG);
+                u8 stat = sgiioc4_INB(hwif->io_ports[IDE_STATUS_OFFSET]);
                 int count = 0;
-                stat = sgiioc4_INB(IDE_STATUS_REG);
+                stat = sgiioc4_INB(hwif->io_ports[IDE_STATUS_OFFSET]);
                 while ((stat & 0x80) && (count++ < 100)) {
                         udelay(1);
-                        stat = sgiioc4_INB(IDE_STATUS_REG);
+                        stat = sgiioc4_INB(hwif->io_ports[IDE_STATUS_OFFSET]);
                 }
 
                 if (intr_reg & 0x02) {