diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-11-17 12:56:17 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2011-11-24 03:01:41 -0500 |
commit | 46d026ac1029daa89dd3bf8a3b458fdaab0a3893 (patch) | |
tree | eaaef690800400178534868069ff289e908ff9dc /arch/powerpc/platforms/85xx/tqm85xx.c | |
parent | 543a07b17389d751dbe2683d34e79be7c10ab6ac (diff) |
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/tqm85xx.c')
-rw-r--r-- | arch/powerpc/platforms/85xx/tqm85xx.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c index b9e53ccf1143..2418bf8d074b 100644 --- a/arch/powerpc/platforms/85xx/tqm85xx.c +++ b/arch/powerpc/platforms/85xx/tqm85xx.c | |||
@@ -142,19 +142,7 @@ static void __init tqm85xx_ti1520_fixup(struct pci_dev *pdev) | |||
142 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1520, | 142 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1520, |
143 | tqm85xx_ti1520_fixup); | 143 | tqm85xx_ti1520_fixup); |
144 | 144 | ||
145 | static struct of_device_id __initdata of_bus_ids[] = { | 145 | machine_device_initcall(tqm85xx, mpc85xx_common_publish_devices); |
146 | { .compatible = "simple-bus", }, | ||
147 | { .compatible = "gianfar", }, | ||
148 | {}, | ||
149 | }; | ||
150 | |||
151 | static int __init declare_of_platform_devices(void) | ||
152 | { | ||
153 | of_platform_bus_probe(NULL, of_bus_ids, NULL); | ||
154 | |||
155 | return 0; | ||
156 | } | ||
157 | machine_device_initcall(tqm85xx, declare_of_platform_devices); | ||
158 | 146 | ||
159 | static const char *board[] __initdata = { | 147 | static const char *board[] __initdata = { |
160 | "tqc,tqm8540", | 148 | "tqc,tqm8540", |