Skip to contentSkip to conversation

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

PATCH New Kumar Gala 1 participant 1 message Jun 19, 2009

Subsystems (2)
lore
Share & tools
lore

Kumar Gala

author
#0 lore raw

PATCH 1/1 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.

---
 arch/powerpc/platforms/85xx/socrates.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/platforms/85xx/socrates.c +3 -3
index d0e8443..747d8fb 100644
@@ -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
@@ -124,7 +125,6 @@ define_machine(socrates) {
 	.name			= "Socrates",
 	.probe			= socrates_probe,
 	.setup_arch		= socrates_setup_arch,
-	.init			= socrates_init,
 	.init_IRQ		= socrates_pic_init,
 	.get_irq		= mpic_get_irq,
 	.restart		= fsl_rstcr_restart,
Signature · 1 line
1.6.0.6