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

diff --git a/include/asm-cris/arch-v10/ide.h b/include/asm-cris/arch-v10/ide.h
index ea34e0d0a388..5366e6239328 100644
--- a/include/asm-cris/arch-v10/ide.h
+++ b/include/asm-cris/arch-v10/ide.h
@@ -59,22 +59,19 @@ static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port, u
         int i;
 
         /* fill in ports for ATA addresses 0 to 7 */
-
-        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
-                hw->io_ports[i] = data_port |
+        for (i = 0; i <= 7; i++) {
+                hw->io_ports_array[i] = data_port |
                         IO_FIELD(R_ATA_CTRL_DATA, addr, i) |
                         IO_STATE(R_ATA_CTRL_DATA, cs0, active);
         }
 
         /* the IDE control register is at ATA address 6, with CS1 active instead of CS0 */
-
-        hw->io_ports[IDE_CONTROL_OFFSET] = data_port |
+        hw->io_ports.ctl_addr = data_port |
                         IO_FIELD(R_ATA_CTRL_DATA, addr, 6) |
                         IO_STATE(R_ATA_CTRL_DATA, cs1, active);
 
         /* whats this for ? */
-
-        hw->io_ports[IDE_IRQ_OFFSET] = 0;
+        hw->io_ports.irq_addr = 0;
 }
 
 static inline void ide_init_default_hwifs(void)