2 files changed, 20 insertions, 15 deletions

diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index a82f6efb660b..f0e638dcc3ab 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -131,7 +131,7 @@ static int pcmcia_schlvl = PCMCIA_SCHLVL;
 #if defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT)
 static int __init m8xx_ide_init_ports(hw_regs_t *hw, unsigned long data_port)
 {
-        unsigned long *p = hw->io_ports;
+        unsigned long *p = hw->io_ports_array;
         int i;
 
         typedef struct {
@@ -314,7 +314,7 @@ static int __init m8xx_ide_init_ports(hw_regs_t *hw, unsigned long data_port)
 #if defined(CONFIG_IDE_EXT_DIRECT)
 static int __init m8xx_ide_init_ports(hw_regs_t *hw, unsigned long data_port)
 {
-        unsigned long *p = hw->io_ports;
+        unsigned long *p = hw->io_ports_array;
         int i;
 
         u32 ide_phy_base;
@@ -811,24 +811,28 @@ static int __init mpc8xx_ide_probe(void)
 #ifdef IDE0_BASE_OFFSET
         memset(&hw, 0, sizeof(hw));
         if (!m8xx_ide_init_ports(&hw, 0)) {
-                ide_hwif_t *hwif = &ide_hwifs[0];
+                ide_hwif_t *hwif = ide_find_port();
 
-                ide_init_port_hw(hwif, &hw);
-                hwif->pio_mask = ATA_PIO4;
-                hwif->port_ops = &m8xx_port_ops;
+                if (hwif) {
+                        ide_init_port_hw(hwif, &hw);
+                        hwif->pio_mask = ATA_PIO4;
+                        hwif->port_ops = &m8xx_port_ops;
 
-                idx[0] = 0;
+                        idx[0] = hwif->index;
+                }
         }
 #ifdef IDE1_BASE_OFFSET
         memset(&hw, 0, sizeof(hw));
         if (!m8xx_ide_init_ports(&hw, 1)) {
-                ide_hwif_t *mate = &ide_hwifs[1];
+                ide_hwif_t *mate = ide_find_port();
 
-                ide_init_port_hw(mate, &hw);
-                mate->pio_mask = ATA_PIO4;
-                mate->port_ops = &m8xx_port_ops;
+                if (mate) {
+                        ide_init_port_hw(mate, &hw);
+                        mate->pio_mask = ATA_PIO4;
+                        mate->port_ops = &m8xx_port_ops;
 
-                idx[1] = 1;
+                        idx[1] = mate->index;
+                }
         }
 #endif
 #endif
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 185faa0dce94..3cac6b2790dd 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -417,7 +417,7 @@ static void pmac_ide_kauai_selectproc(ide_drive_t *drive);
 #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
 
 #define PMAC_IDE_REG(x) \
-        ((void __iomem *)((drive)->hwif->io_ports[IDE_DATA_OFFSET] + (x)))
+        ((void __iomem *)((drive)->hwif->io_ports.data_addr + (x)))
 
 /*
  * Apply the timings of the proper unit (master/slave) to the shared
@@ -1086,8 +1086,9 @@ static void __devinit pmac_ide_init_ports(hw_regs_t *hw, unsigned long base)
         int i;
 
         for (i = 0; i < 8; ++i)
-                hw->io_ports[i] = base + i * 0x10;
-        hw->io_ports[8] = base + 0x160;
+                hw->io_ports_array[i] = base + i * 0x10;
+
+        hw->io_ports.ctl_addr = base + 0x160;
 }
 
 /*