diff options
| author |   Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-12-24 10:42:02 -0600 |
|---|---|---|
| committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-12-24 10:42:02 -0600 |
| commit | 3f8c5c3b4d07fa24e7081a54798ddfab7360a102 (patch) | |
| tree | 3bcd0754918c06ed8d532b09f1135a1b7316691c /arch/powerpc/platforms/40x | |
| parent | [POWERPC] Remove unneeded variable declarations from mpc837x_mds (diff) | |
| download | linux-dev-3f8c5c3b4d07fa24e7081a54798ddfab7360a102.tar.xz linux-dev-3f8c5c3b4d07fa24e7081a54798ddfab7360a102.zip | |
[POWERPC] 4xx: Use machine_device_initcall for bus probe
Some machine_xx_initcall macros were recently added that check for the machine
type before calling the function. This converts the 4xx platforms to use those
for bus probing.
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc/platforms/40x')
| -rw-r--r-- | arch/powerpc/platforms/40x/ep405.c | 5 | ||||
| -rw-r--r-- | arch/powerpc/platforms/40x/kilauea.c | 5 | ||||
| -rw-r--r-- | arch/powerpc/platforms/40x/makalu.c | 5 | ||||
| -rw-r--r-- | arch/powerpc/platforms/40x/virtex.c | 5 | ||||
| -rw-r--r-- | arch/powerpc/platforms/40x/walnut.c | 5 |
5 files changed, 5 insertions, 20 deletions
diff --git a/arch/powerpc/platforms/40x/ep405.c b/arch/powerpc/platforms/40x/ep405.c index 8f73b6222e8b..13d1345026da 100644 --- a/arch/powerpc/platforms/40x/ep405.c +++ b/arch/powerpc/platforms/40x/ep405.c @@ -57,14 +57,11 @@ static __initdata struct of_device_id ep405_of_bus[] = { static int __init ep405_device_probe(void) { - if (!machine_is(ep405)) - return 0; - of_platform_bus_probe(NULL, ep405_of_bus, NULL); return 0; } -device_initcall(ep405_device_probe); +machine_device_initcall(ep405, ep405_device_probe); static void __init ep405_init_bcsr(void) { diff --git a/arch/powerpc/platforms/40x/kilauea.c b/arch/powerpc/platforms/40x/kilauea.c index a23368042e67..f9206a7fede0 100644 --- a/arch/powerpc/platforms/40x/kilauea.c +++ b/arch/powerpc/platforms/40x/kilauea.c @@ -30,14 +30,11 @@ static __initdata struct of_device_id kilauea_of_bus[] = { static int __init kilauea_device_probe(void) { - if (!machine_is(kilauea)) - return 0; - of_platform_bus_probe(NULL, kilauea_of_bus, NULL); return 0; } -device_initcall(kilauea_device_probe); +machine_device_initcall(kilauea, kilauea_device_probe); static int __init kilauea_probe(void) { diff --git a/arch/powerpc/platforms/40x/makalu.c b/arch/powerpc/platforms/40x/makalu.c index 68bad7764522..4e4df72fc9cd 100644 --- a/arch/powerpc/platforms/40x/makalu.c +++ b/arch/powerpc/platforms/40x/makalu.c @@ -30,14 +30,11 @@ static __initdata struct of_device_id makalu_of_bus[] = { static int __init makalu_device_probe(void) { - if (!machine_is(makalu)) - return 0; - of_platform_bus_probe(NULL, makalu_of_bus, NULL); return 0; } -device_initcall(makalu_device_probe); +machine_device_initcall(makalu, makalu_device_probe); static int __init makalu_probe(void) { diff --git a/arch/powerpc/platforms/40x/virtex.c b/arch/powerpc/platforms/40x/virtex.c index 14bbc328170f..43fcc8e9f7d0 100644 --- a/arch/powerpc/platforms/40x/virtex.c +++ b/arch/powerpc/platforms/40x/virtex.c @@ -17,14 +17,11 @@ static int __init virtex_device_probe(void) { - if (!machine_is(virtex)) - return 0; - of_platform_bus_probe(NULL, NULL, NULL); return 0; } -device_initcall(virtex_device_probe); +machine_device_initcall(virtex, virtex_device_probe); static int __init virtex_probe(void) { diff --git a/arch/powerpc/platforms/40x/walnut.c b/arch/powerpc/platforms/40x/walnut.c index a968e88a58a7..f115b6dbf5ad 100644 --- a/arch/powerpc/platforms/40x/walnut.c +++ b/arch/powerpc/platforms/40x/walnut.c @@ -35,14 +35,11 @@ static __initdata struct of_device_id walnut_of_bus[] = { static int __init walnut_device_probe(void) { - if (!machine_is(walnut)) - return 0; - of_platform_bus_probe(NULL, walnut_of_bus, NULL); return 0; } -device_initcall(walnut_device_probe); +machine_device_initcall(walnut, walnut_device_probe); static int __init walnut_probe(void) { |