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, 1 deletions

diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 8957cbadf5c2..1a03a2a285ef 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -26,10 +26,16 @@
 
 void __init ide_arm_init(void)
 {
+        ide_hwif_t *hwif;
         hw_regs_t hw;
 
         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, NULL, 1, NULL);
+
+        hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+        if (hwif) {
+                ide_init_port_data(hwif, hwif->index);
+                ide_init_port_hw(hwif, &hw);
+        }
 }