Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (58 commits)
  ide: remove ide_init_default_irq() macro
  ide: move default IDE ports setup to ide_generic host driver
  ide: remove obsoleted "idex=noprobe" kernel parameter (take 2)
  ide: remove needless hwif->irq check from ide_hwif_configure()
  ide: init hwif->{io_ports,irq} explicitly in legacy VLB host drivers
  ide: limit legacy VLB host drivers to alpha, x86 and mips
  cmd640: init hwif->{io_ports,irq} explicitly
  cmd640: cleanup setup_device_ptrs()
  ide: add ide-4drives host driver (take 3)
  ide: remove ppc ifdef from init_ide_data()
  ide: remove ide_default_io_ctl() macro
  ide: remove CONFIG_IDE_ARCH_OBSOLETE_INIT
  ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS (take 2)
  ppc/pmac: remove no longer needed IDE quirk
  ppc: don't include <linux/ide.h>
  ppc: remove ppc_ide_md
  ppc/pplus: remove ppc_ide_md.ide_init_hwif hook
  ppc/sandpoint: remove ppc_ide_md hooks
  ppc/lopec: remove ppc_ide_md hooks
  ppc/mpc8xx: remove ppc_ide_md hooks
  ...

2 files changed, 37 insertions, 153 deletions

diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index ebaba01c7551..a784a97ca7ec 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -99,32 +99,6 @@ static int _slot_ = -1;			/* will be read from PCMCIA registers   */
 /* Make clock cycles and always round up */
 #define PCMCIA_MK_CLKS( t, T ) (( (t) * ((T)/1000000) + 999U ) / 1000U )
 
-
-
-/*
- * IDE stuff.
- */
-static int
-m8xx_ide_default_irq(unsigned long base)
-{
-#ifdef CONFIG_BLK_DEV_MPC8xx_IDE
-        if (base >= MAX_HWIFS)
-                return 0;
-
-        printk("[%d] m8xx_ide_default_irq %d\n",__LINE__,ioport_dsc[base].irq);
-        
-        return (ioport_dsc[base].irq);
-#else
-        return 9;
-#endif
-}
-
-static unsigned long
-m8xx_ide_default_io_base(int index)
-{
-        return index;
-}
-
 #define M8XX_PCMCIA_CD2(slot)      (0x10000000 >> (slot << 4))
 #define M8XX_PCMCIA_CD1(slot)      (0x08000000 >> (slot << 4))
 
@@ -149,12 +123,11 @@ static int pcmcia_schlvl = PCMCIA_SCHLVL;
  */
 
 /*
- * m8xx_ide_init_hwif_ports for a direct IDE interface _using_
+ * m8xx_ide_init_ports() for a direct IDE interface _using_
+ * MPC8xx's internal PCMCIA interface
  */
 #if defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT)
-static void
-m8xx_ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port, 
-                unsigned long ctrl_port, int *irq)
+static void __init m8xx_ide_init_ports(hw_regs_t *hw, unsigned long data_port)
 {
         unsigned long *p = hw->io_ports;
         int i;
@@ -173,8 +146,6 @@ m8xx_ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
         unsigned long base;
 
         *p = 0;
-        if (irq)
-                *irq = 0;
 
         pcmp = (pcmconf8xx_t *)(&(((immap_t *)IMAP_ADDR)->im_pcmcia));
 
@@ -248,9 +219,6 @@ m8xx_ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
                 }
         }
 
-        if (data_port >= MAX_HWIFS)
-                return;
-
         if (_slot_ == -1) {
                 printk ("PCMCIA slot has not been defined! Using A as default\n");
                 _slot_ = 0;
@@ -292,11 +260,13 @@ m8xx_ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
                 *p++ = base + ioport_dsc[data_port].reg_off[i];
         }
 
-        if (irq) {
+        hw->irq = ioport_dsc[data_port].irq;
+        hw->ack_intr = (ide_ack_intr_t *)ide_interrupt_ack;
+
 #ifdef CONFIG_IDE_8xx_PCCARD
+        {
                 unsigned int reg;
 
-                *irq = ioport_dsc[data_port].irq;
                 if (_slot_)
                         pgcrx = &((immap_t *) IMAP_ADDR)->im_pcmcia.pcmc_pgcrb;
                 else
@@ -306,14 +276,11 @@ m8xx_ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
                 reg |= mk_int_int_mask (pcmcia_schlvl) << 24;
                 reg |= mk_int_int_mask (pcmcia_schlvl) << 16;
                 *pgcrx = reg;
-#else   /* direct connected IDE drive, i.e. external IRQ, not the PCMCIA irq */
-                *irq = ioport_dsc[data_port].irq;
-#endif  /* CONFIG_IDE_8xx_PCCARD */
         }
+#endif  /* CONFIG_IDE_8xx_PCCARD */
 
         ide_hwifs[data_port].pio_mask = ATA_PIO4;
         ide_hwifs[data_port].set_pio_mode = m8xx_ide_set_pio_mode;
-        ide_hwifs[data_port].ack_intr = (ide_ack_intr_t *)ide_interrupt_ack;
 
         /* Enable Harddisk Interrupt,
          * and make it edge sensitive
@@ -329,16 +296,15 @@ m8xx_ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
         /* Enable falling edge irq */
         pcmp->pcmc_per = 0x100000 >> (16 * _slot_);
 #endif  /* CONFIG_IDE_8xx_PCCARD */
-}       /* m8xx_ide_init_hwif_ports() using 8xx internal PCMCIA interface */
+}
 #endif /* CONFIG_IDE_8xx_PCCARD || CONFIG_IDE_8xx_DIRECT */
 
 /*
- * m8xx_ide_init_hwif_ports for a direct IDE interface _not_ using
+ * m8xx_ide_init_ports() for a direct IDE interface _not_ using
  * MPC8xx's internal PCMCIA interface
  */
 #if defined(CONFIG_IDE_EXT_DIRECT)
-void m8xx_ide_init_hwif_ports (hw_regs_t *hw,
-        unsigned long data_port, unsigned long ctrl_port, int *irq)
+static void __init m8xx_ide_init_ports(hw_regs_t *hw, unsigned long data_port)
 {
         unsigned long *p = hw->io_ports;
         int i;
@@ -349,8 +315,6 @@ void m8xx_ide_init_hwif_ports (hw_regs_t *hw,
         unsigned long base;
 
         *p = 0;
-        if (irq)
-                *irq = 0;
 
         if (!ide_base) {
 
@@ -372,9 +336,6 @@ void m8xx_ide_init_hwif_ports (hw_regs_t *hw,
 #endif
         }
 
-        if (data_port >= MAX_HWIFS)
-                return;
-
         base = ide_base + ioport_dsc[data_port].base_off;
 #ifdef DEBUG
         printk ("base: %08x + %08x = %08x\n",
@@ -392,14 +353,12 @@ void m8xx_ide_init_hwif_ports (hw_regs_t *hw,
                 *p++ = base + ioport_dsc[data_port].reg_off[i];
         }
 
-        if (irq) {
-                /* direct connected IDE drive, i.e. external IRQ */
-                *irq = ioport_dsc[data_port].irq;
-        }
+        /* direct connected IDE drive, i.e. external IRQ */
+        hw->irq = ioport_dsc[data_port].irq;
+        hw->ack_intr = (ide_ack_intr_t *)ide_interrupt_ack;
 
         ide_hwifs[data_port].pio_mask = ATA_PIO4;
         ide_hwifs[data_port].set_pio_mode = m8xx_ide_set_pio_mode;
-        ide_hwifs[data_port].ack_intr = (ide_ack_intr_t *)ide_interrupt_ack;
 
         /* Enable Harddisk Interrupt,
          * and make it edge sensitive
@@ -407,8 +366,7 @@ void m8xx_ide_init_hwif_ports (hw_regs_t *hw,
         /* (11-18) Set edge detect for irq, no wakeup from low power mode */
         ((immap_t *) IMAP_ADDR)->im_siu_conf.sc_siel |=
                         (0x80000000 >> ioport_dsc[data_port].irq);
-}       /* m8xx_ide_init_hwif_ports() for CONFIG_IDE_8xx_DIRECT */ 
-
+}
 #endif  /* CONFIG_IDE_8xx_DIRECT */
 
 
@@ -829,20 +787,20 @@ static int identify  (volatile u8 *p)
         return (0);     /* don't know */
 }
 
-void m8xx_ide_init(void)
-{
-        ppc_ide_md.default_irq          = m8xx_ide_default_irq;
-        ppc_ide_md.default_io_base      = m8xx_ide_default_io_base;
-        ppc_ide_md.ide_init_hwif        = m8xx_ide_init_hwif_ports;
-}
-
 static int __init mpc8xx_ide_probe(void)
 {
+        hw_regs_t hw;
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
 #ifdef IDE0_BASE_OFFSET
+        memset(&hw, 0, sizeof(hw));
+        m8xx_ide_init_ports(&hw, 0);
+        ide_init_port_hw(&ide_hwifs[0], &hw);
         idx[0] = 0;
 #ifdef IDE1_BASE_OFFSET
+        memset(&hw, 0, sizeof(hw));
+        m8xx_ide_init_ports(&hw, 1);
+        ide_init_port_hw(&ide_hwifs[1], &hw);
         idx[1] = 1;
 #endif
 #endif
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index d9ca52e6cdab..88619b50d9ef 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -80,7 +80,6 @@ typedef struct pmac_ide_hwif {
 } pmac_ide_hwif_t;
 
 static pmac_ide_hwif_t pmac_ide[MAX_HWIFS];
-static int pmac_ide_count;
 
 enum {
         controller_ohare,       /* OHare based */
@@ -419,38 +418,8 @@ static void pmac_ide_kauai_selectproc(ide_drive_t *drive);
 
 #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
 
-/*
- * N.B. this can't be an initfunc, because the media-bay task can
- * call ide_[un]register at any time.
- */
-void
-pmac_ide_init_hwif_ports(hw_regs_t *hw,
-                              unsigned long data_port, unsigned long ctrl_port,
-                              int *irq)
-{
-        int i, ix;
-
-        if (data_port == 0)
-                return;
-
-        for (ix = 0; ix < MAX_HWIFS; ++ix)
-                if (data_port == pmac_ide[ix].regbase)
-                        break;
-
-        if (ix >= MAX_HWIFS)
-                return;         /* not an IDE PMAC interface */
-
-        for (i = 0; i < 8; ++i)
-                hw->io_ports[i] = data_port + i * 0x10;
-        hw->io_ports[8] = data_port + 0x160;
-
-        if (irq != NULL)
-                *irq = pmac_ide[ix].irq;
-
-        hw->dev = &pmac_ide[ix].mdev->ofdev.dev;
-}
-
-#define PMAC_IDE_REG(x) ((void __iomem *)(IDE_DATA_REG+(x)))
+#define PMAC_IDE_REG(x) \
+        ((void __iomem *)((drive)->hwif->io_ports[IDE_DATA_OFFSET] + (x)))
 
 /*
  * Apply the timings of the proper unit (master/slave) to the shared
@@ -886,58 +855,6 @@ sanitize_timings(pmac_ide_hwif_t *pmif)
         pmif->timings[2] = pmif->timings[3] = value2;
 }
 
-unsigned long
-pmac_ide_get_base(int index)
-{
-        return pmac_ide[index].regbase;
-}
-
-int
-pmac_ide_check_base(unsigned long base)
-{
-        int ix;
-        
-        for (ix = 0; ix < MAX_HWIFS; ++ix)
-                if (base == pmac_ide[ix].regbase)
-                        return ix;
-        return -1;
-}
-
-int
-pmac_ide_get_irq(unsigned long base)
-{
-        int ix;
-
-        for (ix = 0; ix < MAX_HWIFS; ++ix)
-                if (base == pmac_ide[ix].regbase)
-                        return pmac_ide[ix].irq;
-        return 0;
-}
-
-static int ide_majors[] = { 3, 22, 33, 34, 56, 57 };
-
-dev_t __init
-pmac_find_ide_boot(char *bootdevice, int n)
-{
-        int i;
-        
-        /*
-         * Look through the list of IDE interfaces for this one.
-         */
-        for (i = 0; i < pmac_ide_count; ++i) {
-                char *name;
-                if (!pmac_ide[i].node || !pmac_ide[i].node->full_name)
-                        continue;
-                name = pmac_ide[i].node->full_name;
-                if (memcmp(name, bootdevice, n) == 0 && name[n] == 0) {
-                        /* XXX should cope with the 2nd drive as well... */
-                        return MKDEV(ide_majors[i], 0);
-                }
-        }
-
-        return 0;
-}
-
 /* Suspend call back, should be called after the child devices
  * have actually been suspended
  */
@@ -1088,7 +1005,8 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw)
         if (np->parent && np->parent->name
             && strcasecmp(np->parent->name, "media-bay") == 0) {
 #ifdef CONFIG_PMAC_MEDIABAY
-                media_bay_set_ide_infos(np->parent, pmif->regbase, pmif->irq, hwif->index);
+                media_bay_set_ide_infos(np->parent, pmif->regbase, pmif->irq,
+                                        hwif);
 #endif /* CONFIG_PMAC_MEDIABAY */
                 pmif->mediabay = 1;
                 if (!bidp)
@@ -1119,7 +1037,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw)
         hwif->hwif_data = pmif;
         ide_init_port_hw(hwif, hw);
         hwif->noprobe = pmif->mediabay;
-        hwif->hold = pmif->mediabay;
         hwif->cbl = pmif->cable_80 ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
         hwif->set_pio_mode = pmac_ide_set_pio_mode;
         if (pmif->kind == controller_un_ata6
@@ -1154,6 +1071,15 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw)
         return 0;
 }
 
+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;
+}
+
 /*
  * Attach to a macio probed interface
  */
@@ -1227,7 +1153,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)
         dev_set_drvdata(&mdev->ofdev.dev, hwif);
 
         memset(&hw, 0, sizeof(hw));
-        pmac_ide_init_hwif_ports(&hw, pmif->regbase, 0, NULL);
+        pmac_ide_init_ports(&hw, pmif->regbase);
         hw.irq = irq;
         hw.dev = &mdev->ofdev.dev;
 
@@ -1341,7 +1267,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         pci_set_drvdata(pdev, hwif);
 
         memset(&hw, 0, sizeof(hw));
-        pmac_ide_init_hwif_ports(&hw, pmif->regbase, 0, NULL);
+        pmac_ide_init_ports(&hw, pmif->regbase);
         hw.irq = pdev->irq;
         hw.dev = &pdev->dev;