提交 a44a23ed 编写于 作者: K Kumar Gala

powerpc/85xx: Stop using ppc_md.init on socrates

Match what other 85xx platforms do for of_platform_bus_probe and use
machine_device_initcall.  This is one small step in killing of
ppc_md.init.
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
上级 5e10cf58
...@@ -102,10 +102,11 @@ static struct of_device_id __initdata socrates_of_bus_ids[] = { ...@@ -102,10 +102,11 @@ static struct of_device_id __initdata socrates_of_bus_ids[] = {
{}, {},
}; };
static void __init socrates_init(void) static int __init socrates_publish_devices(void)
{ {
of_platform_bus_probe(NULL, socrates_of_bus_ids, NULL); return of_platform_bus_probe(NULL, socrates_of_bus_ids, NULL);
} }
machine_device_initcall(socrates, socrates_publish_devices);
/* /*
* Called very early, device-tree isn't unflattened * Called very early, device-tree isn't unflattened
...@@ -124,7 +125,6 @@ define_machine(socrates) { ...@@ -124,7 +125,6 @@ define_machine(socrates) {
.name = "Socrates", .name = "Socrates",
.probe = socrates_probe, .probe = socrates_probe,
.setup_arch = socrates_setup_arch, .setup_arch = socrates_setup_arch,
.init = socrates_init,
.init_IRQ = socrates_pic_init, .init_IRQ = socrates_pic_init,
.get_irq = mpic_get_irq, .get_irq = mpic_get_irq,
.restart = fsl_rstcr_restart, .restart = fsl_rstcr_restart,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册