ide: add struct ide_io_ports (take 3)

* Add struct ide_io_ports and use it instead of `unsigned long io_ports[]`
  in ide_hwif_t.

* Rename io_ports[] in hw_regs_t to io_ports_array[].

* Use un-named union for 'unsigned long io_ports_array[]' and 'struct
  ide_io_ports io_ports' in hw_regs_t.

* Remove IDE_*_OFFSET defines.

v2:
* scc_pata.c build fix from Stephen Rothwell.

v3:
* Fix ctl_adrr typo in Sparc-specific part of ns87415.c.
  (Noticed by Andrew Morton)

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

1 files changed, 34 insertions, 38 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 9c646bd63549..5425d3038ec2 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -164,7 +164,7 @@ void SELECT_DRIVE (ide_drive_t *drive)
         if (port_ops && port_ops->selectproc)
                 port_ops->selectproc(drive);
 
-        hwif->OUTB(drive->select.all, hwif->io_ports[IDE_SELECT_OFFSET]);
+        hwif->OUTB(drive->select.all, hwif->io_ports.device_addr);
 }
 
 void SELECT_MASK (ide_drive_t *drive, int mask)
@@ -194,24 +194,22 @@ static void ata_vlb_sync(ide_drive_t *drive, unsigned long port)
  */
 static void ata_input_data(ide_drive_t *drive, void *buffer, u32 wcount)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-        u8 io_32bit             = drive->io_32bit;
+        ide_hwif_t *hwif = drive->hwif;
+        struct ide_io_ports *io_ports = &hwif->io_ports;
+        u8 io_32bit = drive->io_32bit;
 
         if (io_32bit) {
                 if (io_32bit & 2) {
                         unsigned long flags;
 
                         local_irq_save(flags);
-                        ata_vlb_sync(drive, hwif->io_ports[IDE_NSECTOR_OFFSET]);
-                        hwif->INSL(hwif->io_ports[IDE_DATA_OFFSET], buffer,
-                                   wcount);
+                        ata_vlb_sync(drive, io_ports->nsect_addr);
+                        hwif->INSL(io_ports->data_addr, buffer, wcount);
                         local_irq_restore(flags);
                 } else
-                        hwif->INSL(hwif->io_ports[IDE_DATA_OFFSET], buffer,
-                                   wcount);
+                        hwif->INSL(io_ports->data_addr, buffer, wcount);
         } else
-                hwif->INSW(hwif->io_ports[IDE_DATA_OFFSET], buffer,
-                           wcount << 1);
+                hwif->INSW(io_ports->data_addr, buffer, wcount << 1);
 }
 
 /*
@@ -219,24 +217,22 @@ static void ata_input_data(ide_drive_t *drive, void *buffer, u32 wcount)
  */
 static void ata_output_data(ide_drive_t *drive, void *buffer, u32 wcount)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-        u8 io_32bit             = drive->io_32bit;
+        ide_hwif_t *hwif = drive->hwif;
+        struct ide_io_ports *io_ports = &hwif->io_ports;
+        u8 io_32bit = drive->io_32bit;
 
         if (io_32bit) {
                 if (io_32bit & 2) {
                         unsigned long flags;
 
                         local_irq_save(flags);
-                        ata_vlb_sync(drive, hwif->io_ports[IDE_NSECTOR_OFFSET]);
-                        hwif->OUTSL(hwif->io_ports[IDE_DATA_OFFSET], buffer,
-                                    wcount);
+                        ata_vlb_sync(drive, io_ports->nsect_addr);
+                        hwif->OUTSL(io_ports->data_addr, buffer, wcount);
                         local_irq_restore(flags);
                 } else
-                        hwif->OUTSL(hwif->io_ports[IDE_DATA_OFFSET], buffer,
-                                    wcount);
+                        hwif->OUTSL(io_ports->data_addr, buffer, wcount);
         } else
-                hwif->OUTSW(hwif->io_ports[IDE_DATA_OFFSET], buffer,
-                            wcount << 1);
+                hwif->OUTSW(io_ports->data_addr, buffer, wcount << 1);
 }
 
 /*
@@ -255,14 +251,13 @@ 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(hwif->io_ports[IDE_DATA_OFFSET], buffer,
-                           bytecount / 2);
+                insw_swapw(hwif->io_ports.data_addr, buffer, bytecount / 2);
                 return;
         }
 #endif /* CONFIG_ATARI || CONFIG_Q40 */
         hwif->ata_input_data(drive, buffer, bytecount / 4);
         if ((bytecount & 0x03) >= 2)
-                hwif->INSW(hwif->io_ports[IDE_DATA_OFFSET],
+                hwif->INSW(hwif->io_ports.data_addr,
                            (u8 *)buffer + (bytecount & ~0x03), 1);
 }
 
@@ -274,14 +269,13 @@ 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(hwif->io_ports[IDE_DATA_OFFSET], buffer,
-                            bytecount / 2);
+                outsw_swapw(hwif->io_ports.data_addr, buffer, bytecount / 2);
                 return;
         }
 #endif /* CONFIG_ATARI || CONFIG_Q40 */
         hwif->ata_output_data(drive, buffer, bytecount / 4);
         if ((bytecount & 0x03) >= 2)
-                hwif->OUTSW(hwif->io_ports[IDE_DATA_OFFSET],
+                hwif->OUTSW(hwif->io_ports.data_addr,
                             (u8 *)buffer + (bytecount & ~0x03), 1);
 }
 
@@ -445,7 +439,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 (hwif->io_ports[IDE_CONTROL_OFFSET])
+        if (hwif->io_ports.ctl_addr)
                 stat = ide_read_altstatus(drive);
         else
                 /* Note: this may clear a pending IRQ!! */
@@ -647,7 +641,7 @@ int ide_driveid_update(ide_drive_t *drive)
         SELECT_MASK(drive, 1);
         ide_set_irq(drive, 1);
         msleep(50);
-        hwif->OUTB(WIN_IDENTIFY, hwif->io_ports[IDE_COMMAND_OFFSET]);
+        hwif->OUTB(WIN_IDENTIFY, hwif->io_ports.command_addr);
         timeout = jiffies + WAIT_WORSTCASE;
         do {
                 if (time_after(jiffies, timeout)) {
@@ -696,6 +690,7 @@ int ide_driveid_update(ide_drive_t *drive)
 int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
 {
         ide_hwif_t *hwif = drive->hwif;
+        struct ide_io_ports *io_ports = &hwif->io_ports;
         int error = 0;
         u8 stat;
 
@@ -734,10 +729,9 @@ 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, 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]);
+        hwif->OUTB(speed, io_ports->nsect_addr);
+        hwif->OUTB(SETFEATURES_XFER, io_ports->feature_addr);
+        hwif->OUTBSYNC(drive, WIN_SETFEATURES, io_ports->command_addr);
         if (drive->quirk_list == 2)
                 ide_set_irq(drive, 1);
 
@@ -845,7 +839,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, hwif->io_ports[IDE_COMMAND_OFFSET]);
+        hwif->OUTBSYNC(drive, cmd, hwif->io_ports.command_addr);
         /*
          * Drive takes 400nS to respond, we must avoid the IRQ being
          * serviced before that.
@@ -1029,6 +1023,7 @@ 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;
+        struct ide_io_ports *io_ports;
         const struct ide_port_ops *port_ops;
         u8 ctl;
 
@@ -1036,6 +1031,8 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
         hwif = HWIF(drive);
         hwgroup = HWGROUP(drive);
 
+        io_ports = &hwif->io_ports;
+
         /* We must not reset with running handlers */
         BUG_ON(hwgroup->handler != NULL);
 
@@ -1045,8 +1042,7 @@ 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,
-                               hwif->io_ports[IDE_COMMAND_OFFSET]);
+                hwif->OUTBSYNC(drive, WIN_SRST, io_ports->command_addr);
                 ndelay(400);
                 hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE;
                 hwgroup->polling = 1;
@@ -1062,7 +1058,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 (hwif->io_ports[IDE_CONTROL_OFFSET] == 0) {
+        if (io_ports->ctl_addr == 0) {
                 spin_unlock_irqrestore(&ide_lock, flags);
                 return ide_stopped;
         }
@@ -1077,14 +1073,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, hwif->io_ports[IDE_CONTROL_OFFSET]);
+        hwif->OUTBSYNC(drive, drive->ctl|6, io_ports->ctl_addr);
         /* more than enough time */
         udelay(10);
         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]);
+        hwif->OUTBSYNC(drive, ctl, io_ports->ctl_addr);
         /* more than enough time */
         udelay(10);
         hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE;
@@ -1129,7 +1125,7 @@ int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout)
                  * about locking issues (2.5 work ?).
                  */
                 mdelay(1);
-                stat = hwif->INB(hwif->io_ports[IDE_STATUS_OFFSET]);
+                stat = hwif->INB(hwif->io_ports.status_addr);
                 if ((stat & BUSY_STAT) == 0)
                         return 0;
                 /*