15 files changed, 34 insertions, 42 deletions

diff --git a/drivers/ide/arm/bast-ide.c b/drivers/ide/arm/bast-ide.c
index f7449d04114a..48db6167bb90 100644
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
@@ -45,7 +45,7 @@ bastide_register(unsigned int base, unsigned int aux, int irq,
         hw.io_ports[IDE_CONTROL_OFFSET] = aux + (6 * 0x20);
         hw.irq = irq;
 
-        ide_register_hw(&hw, 0, hwif);
+        ide_register_hw(&hw, NULL, 0, hwif);
 
         return 0;
 }
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index bce2bec81413..8957cbadf5c2 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -31,5 +31,5 @@ void __init ide_arm_init(void)
         memset(&hw, 0, sizeof(hw));
         ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);
         hw.irq = IDE_ARM_IRQ;
-        ide_register_hw(&hw, 1, NULL);
+        ide_register_hw(&hw, NULL, 1, NULL);
 }
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 9a96a10ba9d3..ff20377b4c82 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -782,7 +782,7 @@ init_e100_ide (void)
                                 ide_offsets,
                                 0, 0, cris_ide_ack_intr,
                                 ide_default_irq(0));
-                ide_register_hw(&hw, 1, &hwif);
+                ide_register_hw(&hw, NULL, 1, &hwif);
                 hwif->mmio = 1;
                 hwif->chipset = ide_etrax100;
                 hwif->set_pio_mode = &cris_set_pio_mode;
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index 6d26ad7360d5..37b9174a7edc 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -101,7 +101,7 @@ void __init h8300_ide_init(void)
         hw_setup(&hw);
 
         /* register if */
-        idx = ide_register_hw(&hw, 1, &hwif);
+        idx = ide_register_hw(&hw, NULL, 1, &hwif);
         if (idx == -1) {
                 printk(KERN_ERR "ide-h8300: IDE I/F register failed\n");
                 return;
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index 2b8009c50e91..2afaa87022e3 100644
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -42,7 +42,7 @@ static int idepnp_probe(struct pnp_dev * dev, const struct pnp_device_id *dev_id
         hw.irq = pnp_irq(dev, 0);
         hw.dma = NO_DMA;
 
-        index = ide_register_hw(&hw, 1, &hwif);
+        index = ide_register_hw(&hw, NULL, 1, &hwif);
 
         if (index != -1) {
                 printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 549174853381..c6ba439b1435 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -717,7 +717,7 @@ EXPORT_SYMBOL_GPL(ide_undecoded_slave);
  * This routine only knows how to look for drive units 0 and 1
  * on an interface, so any setting of MAX_DRIVES > 2 won't work here.
  */
-static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
+static void probe_hwif(ide_hwif_t *hwif)
 {
         unsigned long flags;
         unsigned int irqd;
@@ -819,8 +819,8 @@ static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
                 return;
         }
 
-        if (fixup)
-                fixup(hwif);
+        if (hwif->fixup)
+                hwif->fixup(hwif);
 
         for (unit = 0; unit < MAX_DRIVES; ++unit) {
                 ide_drive_t *drive = &hwif->drives[unit];
@@ -861,9 +861,9 @@ static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
 static int hwif_init(ide_hwif_t *hwif);
 static void hwif_register_devices(ide_hwif_t *hwif);
 
-int probe_hwif_init_with_fixup(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
+int probe_hwif_init(ide_hwif_t *hwif)
 {
-        probe_hwif(hwif, fixup);
+        probe_hwif(hwif);
 
         if (!hwif_init(hwif)) {
                 printk(KERN_INFO "%s: failed to initialize IDE interface\n",
@@ -877,11 +877,6 @@ int probe_hwif_init_with_fixup(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif)
         return 0;
 }
 
-int probe_hwif_init(ide_hwif_t *hwif)
-{
-        return probe_hwif_init_with_fixup(hwif, NULL);
-}
-
 EXPORT_SYMBOL(probe_hwif_init);
 
 #if MAX_HWIFS > 1
@@ -1394,7 +1389,7 @@ int ideprobe_init (void)
 
         for (index = 0; index < MAX_HWIFS; ++index)
                 if (probe[index])
-                        probe_hwif(&ide_hwifs[index], NULL);
+                        probe_hwif(&ide_hwifs[index]);
         for (index = 0; index < MAX_HWIFS; ++index)
                 if (probe[index])
                         hwif_init(&ide_hwifs[index]);
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 961e6c897286..35f24b9b8219 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -391,6 +391,8 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->cds                       = tmp_hwif->cds;
 #endif
 
+        hwif->fixup                     = tmp_hwif->fixup;
+
         hwif->set_pio_mode              = tmp_hwif->set_pio_mode;
         hwif->set_dma_mode              = tmp_hwif->set_dma_mode;
         hwif->mdma_filter               = tmp_hwif->mdma_filter;
@@ -660,11 +662,11 @@ void ide_setup_ports (	hw_regs_t *hw,
 }
 
 /**
- *      ide_register_hw_with_fixup      -       register IDE interface
+ *      ide_register_hw         -       register IDE interface
  *      @hw: hardware registers
+ *      @fixup: fixup function
  *      @initializing: set while initializing built-in drivers
  *      @hwifp: pointer to returned hwif
- *      @fixup: fixup function
  *
  *      Register an IDE interface, specifying exactly the registers etc.
  *      Set init=1 iff calling before probes have taken place.
@@ -672,9 +674,8 @@ void ide_setup_ports (	hw_regs_t *hw,
  *      Returns -1 on error.
  */
 
-int ide_register_hw_with_fixup(hw_regs_t *hw, int initializing,
-                               ide_hwif_t **hwifp,
-                               void(*fixup)(ide_hwif_t *hwif))
+int ide_register_hw(hw_regs_t *hw, void (*fixup)(ide_hwif_t *),
+                    int initializing, ide_hwif_t **hwifp)
 {
         int index, retry = 1;
         ide_hwif_t *hwif;
@@ -710,11 +711,12 @@ found:
         memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->hw.io_ports));
         hwif->irq = hw->irq;
         hwif->noprobe = 0;
+        hwif->fixup = fixup;
         hwif->chipset = hw->chipset;
         hwif->gendev.parent = hw->dev;
 
         if (!initializing) {
-                probe_hwif_init_with_fixup(hwif, fixup);
+                probe_hwif_init(hwif);
                 ide_proc_register_port(hwif);
         }
 
@@ -724,13 +726,6 @@ found:
         return (initializing || hwif->present) ? index : -1;
 }
 
-EXPORT_SYMBOL(ide_register_hw_with_fixup);
-
-int ide_register_hw(hw_regs_t *hw, int initializing, ide_hwif_t **hwifp)
-{
-        return ide_register_hw_with_fixup(hw, initializing, hwifp, NULL);
-}
-
 EXPORT_SYMBOL(ide_register_hw);
 
 /*
@@ -1046,7 +1041,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
                         ide_init_hwif_ports(&hw, (unsigned long) args[0],
                                             (unsigned long) args[1], NULL);
                         hw.irq = args[2];
-                        if (ide_register_hw(&hw, 0, NULL) == -1)
+                        if (ide_register_hw(&hw, NULL, 0, NULL) == -1)
                                 return -EIO;
                         return 0;
                 }
diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
index 101aee1711c4..4a0be251a05f 100644
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
@@ -212,8 +212,8 @@ fail_base2:
 //                                              xsurf_iops,
                                                 IRQ_AMIGA_PORTS);
                         }       
-                        
-                        index = ide_register_hw(&hw, 1, &hwif);
+
+                        index = ide_register_hw(&hw, NULL, 1, &hwif);
                         if (index != -1) {
                                 hwif->mmio = 1;
                                 printk("ide%d: ", index);
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index f0829b83e970..7d7936f1b900 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -72,7 +72,7 @@ void __init falconide_init(void)
                         0, 0, NULL,
 //                      falconide_iops,
                         IRQ_MFP_IDE);
-        index = ide_register_hw(&hw, 1, NULL);
+        index = ide_register_hw(&hw, NULL, 1, NULL);
 
         if (index != -1)
             printk("ide%d: Falcon IDE interface\n", index);
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index 0830a021bbb6..53331ee1e957 100644
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -165,7 +165,7 @@ found:
 //                      &gayle_iops,
                         IRQ_AMIGA_PORTS);
 
-        index = ide_register_hw(&hw, 1, &hwif);
+        index = ide_register_hw(&hw, NULL, 1, &hwif);
         if (index != -1) {
             hwif->mmio = 1;
             switch (i) {
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index e8e360c2619d..03715c058664 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -153,7 +153,7 @@ static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq
     hw.irq = irq;
     hw.chipset = ide_pci;
     hw.dev = &handle->dev;
-    return ide_register_hw_with_fixup(&hw, 0, NULL, ide_undecoded_slave);
+    return ide_register_hw(&hw, &ide_undecoded_slave, 0, NULL);
 }
 
 /*======================================================================
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index b557c45a5a9d..e87cd2f16430 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -93,21 +93,21 @@ void macide_init(void)
                                 0, 0, macide_ack_intr,
 //                              quadra_ide_iops,
                                 IRQ_NUBUS_F);
-                index = ide_register_hw(&hw, 1, &hwif);
+                index = ide_register_hw(&hw, NULL, 1, &hwif);
                 break;
         case MAC_IDE_PB:
                 ide_setup_ports(&hw, IDE_BASE, macide_offsets,
                                 0, 0, macide_ack_intr,
 //                              macide_pb_iops,
                                 IRQ_NUBUS_C);
-                index = ide_register_hw(&hw, 1, &hwif);
+                index = ide_register_hw(&hw, NULL, 1, &hwif);
                 break;
         case MAC_IDE_BABOON:
                 ide_setup_ports(&hw, BABOON_BASE, macide_offsets,
                                 0, 0, NULL,
 //                              macide_baboon_iops,
                                 IRQ_BABOON_1);
-                index = ide_register_hw(&hw, 1, &hwif);
+                index = ide_register_hw(&hw, NULL, 1, &hwif);
                 if (index == -1) break;
                 if (macintosh_config->ident == MAC_MODEL_PB190) {
 
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index e628a983ce33..a530d6de194a 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -142,7 +142,7 @@ void q40ide_init(void)
                         0, NULL,
 //                      m68kide_iops,
                         q40ide_default_irq(pcide_bases[i]));
-        index = ide_register_hw(&hw, 1, &hwif);
+        index = ide_register_hw(&hw, NULL, 1, &hwif);
         // **FIXME**
         if (index != -1)
                 hwif->mmio = 1;
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index 46f4a888c037..83829081640a 100644
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -80,7 +80,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
         hw.irq = dev->irq;
         hw.chipset = ide_pci;           /* this enables IRQ sharing */
 
-        rc = ide_register_hw_with_fixup(&hw, 0, &hwif, ide_undecoded_slave);
+        rc = ide_register_hw(&hw, &ide_undecoded_slave, 0, &hwif);
         if (rc < 0) {
                 printk(KERN_ERR "delkin_cb: ide_register_hw failed (%d)\n", rc);
                 pci_disable_device(dev);
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index d62b225f569f..4e9de2043113 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -567,6 +567,8 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                     (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS))
                         hwif->irq = port ? 15 : 14;
 
+                hwif->fixup = d->fixup;
+
                 hwif->host_flags = d->host_flags;
                 hwif->pio_mask = d->pio_mask;
 
@@ -692,9 +694,9 @@ int ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d)
                 mate = &ide_hwifs[index_list.b.high];
 
         if (hwif)
-                probe_hwif_init_with_fixup(hwif, d->fixup);
+                probe_hwif_init(hwif);
         if (mate)
-                probe_hwif_init_with_fixup(mate, d->fixup);
+                probe_hwif_init(mate);
 
         if (hwif)
                 ide_proc_register_port(hwif);