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, 3 insertions, 3 deletions

diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index 5c19c422c5cc..56cdaa0eeea5 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -50,12 +50,12 @@ static void __init falconide_setup_ports(hw_regs_t *hw)
 
         memset(hw, 0, sizeof(*hw));
 
-        hw->io_ports[IDE_DATA_OFFSET] = ATA_HD_BASE;
+        hw->io_ports.data_addr = ATA_HD_BASE;
 
         for (i = 1; i < 8; i++)
-                hw->io_ports[i] = ATA_HD_BASE + 1 + i * 4;
+                hw->io_ports_array[i] = ATA_HD_BASE + 1 + i * 4;
 
-        hw->io_ports[IDE_CONTROL_OFFSET] = ATA_HD_BASE + ATA_HD_CONTROL;
+        hw->io_ports.ctl_addr = ATA_HD_BASE + ATA_HD_CONTROL;
 
         hw->irq = IRQ_MFP_IDE;
         hw->ack_intr = NULL;