ide: drop 'initializing' argument from ide_register_hw()

* Rename init_hwif_data() to ide_init_port_data() and export it.

* For all users of ide_register_hw() with 'initializing' argument set
  hwif->present and hwif->hold are always zero so convert these host
  drivers to use ide_find_port()+ide_init_port_data()+ide_init_port_hw()
  instead (also no need for init_hwif_default() call since the setup
  done by it gets over-ridden by ide_init_port_hw() call).

* Drop 'initializing' argument from ide_register_hw().

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index e245521af7b5..664bc489c550 100644
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -31,7 +31,6 @@ static int idepnp_probe(struct pnp_dev * dev, const struct pnp_device_id *dev_id
 {
         hw_regs_t hw;
         ide_hwif_t *hwif;
-        int index;
 
         if (!(pnp_port_valid(dev, 0) && pnp_port_valid(dev, 1) && pnp_irq_valid(dev, 0)))
                 return -1;
@@ -41,10 +40,14 @@ static int idepnp_probe(struct pnp_dev * dev, const struct pnp_device_id *dev_id
                                 pnp_port_start(dev, 1));
         hw.irq = pnp_irq(dev, 0);
 
-        index = ide_register_hw(&hw, NULL, 1, &hwif);
+        hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+        if (hwif) {
+                u8 index = hwif->index;
+
+                ide_init_port_data(hwif, index);
+                ide_init_port_hw(hwif, &hw);
 
-        if (index != -1) {
-                printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index);
+                printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index);
                 pnp_set_drvdata(dev,hwif);
                 return 0;
         }