aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/85xx/socrates.c
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-11-17 21:56:17 +0400
committerKumar Gala <galak@kernel.crashing.org>2011-11-24 02:01:41 -0600
commit46d026ac1029daa89dd3bf8a3b458fdaab0a3893 (patch)
treeeaaef690800400178534868069ff289e908ff9dc /arch/powerpc/platforms/85xx/socrates.c
parentpowerpc/85xx: separate cpm2 pic init (diff)
downloadlinux-dev-46d026ac1029daa89dd3bf8a3b458fdaab0a3893.tar.xz
linux-dev-46d026ac1029daa89dd3bf8a3b458fdaab0a3893.zip
powerpc/85xx: consolidate of_platform_bus_probe calls
85xx board files have a lot of duplication in *_publish_devices()/ *_declare_of_platform_devices() functions. Merge that into a single function common to most of the boards. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx/socrates.c')
-rw-r--r--arch/powerpc/platforms/85xx/socrates.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/powerpc/platforms/85xx/socrates.c b/arch/powerpc/platforms/85xx/socrates.c
index 9d0fc283c1a1..fec496ad79c0 100644
--- a/arch/powerpc/platforms/85xx/socrates.c
+++ b/arch/powerpc/platforms/85xx/socrates.c
@@ -97,17 +97,7 @@ static void __init socrates_setup_arch(void)
#endif
}
-static struct of_device_id __initdata socrates_of_bus_ids[] = {
- { .compatible = "simple-bus", },
- { .compatible = "gianfar", },
- {},
-};
-
-static int __init socrates_publish_devices(void)
-{
- return of_platform_bus_probe(NULL, socrates_of_bus_ids, NULL);
-}
-machine_device_initcall(socrates, socrates_publish_devices);
+machine_device_initcall(socrates, mpc85xx_common_publish_devices);
/*
* Called very early, device-tree isn't unflattened