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, 9 insertions, 5 deletions

diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index 7d7936f1b900..b861cfe25900 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -66,15 +66,19 @@ void __init falconide_init(void)
 {
     if (MACH_IS_ATARI && ATARIHW_PRESENT(IDE)) {
         hw_regs_t hw;
-        int index;
 
         ide_setup_ports(&hw, ATA_HD_BASE, falconide_offsets,
                         0, 0, NULL,
 //                      falconide_iops,
                         IRQ_MFP_IDE);
-        index = ide_register_hw(&hw, NULL, 1, NULL);
 
-        if (index != -1)
-            printk("ide%d: Falcon IDE interface\n", index);
-    }
+        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);
+
+                printk("ide%d: Falcon IDE interface\n", index);
+        }
 }