ide: move ide_arm_init() call from init_ide_data() to ide_init()
* Remove ide_init_port_data() call from ide_arm_init() and move ide_arm_init() call from init_ide_data() to ide_init(). This patch is a preparation for the future changes (and as a side-effect makes obsolete "idex=io[,ctl[,irq]]" kernel parameters work for ide_arm). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
cbb010c180
commit
944000921d
|
@ -35,7 +35,6 @@ void __init ide_arm_init(void)
|
||||||
|
|
||||||
hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
|
hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
|
||||||
if (hwif) {
|
if (hwif) {
|
||||||
ide_init_port_data(hwif, hwif->index);
|
|
||||||
ide_init_port_hw(hwif, &hw);
|
ide_init_port_hw(hwif, &hw);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -218,9 +218,6 @@ static void __init init_ide_data (void)
|
||||||
ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
|
ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#ifdef CONFIG_IDE_ARM
|
|
||||||
ide_arm_init();
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1774,6 +1771,9 @@ static int __init ide_init(void)
|
||||||
|
|
||||||
proc_ide_create();
|
proc_ide_create();
|
||||||
|
|
||||||
|
#ifdef CONFIG_IDE_ARM
|
||||||
|
ide_arm_init();
|
||||||
|
#endif
|
||||||
#ifdef CONFIG_BLK_DEV_ALI14XX
|
#ifdef CONFIG_BLK_DEV_ALI14XX
|
||||||
if (probe_ali14xx)
|
if (probe_ali14xx)
|
||||||
(void)ali14xx_init();
|
(void)ali14xx_init();
|
||||||
|
|
Loading…
Reference in a new issue