ide: move ide_arm_init() call from init_ide_data() to ide_init()

[linux-2.6] / drivers / ide / arm / ide_arm.c

diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 8957cbadf5c2a8c5870800a54ebd1d4b6eebae70..21ba6ac2f826ea32fdd14e9921dda64c4b6aa47b 100644 (file)
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -26,10 +26,15 @@
 
 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_hw(hwif, &hw);
+       }
 }