Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3f8c5c...
Commit: 3f8c5c3b4d07fa24e7081a54798ddfab7360a102
Parent: 9e0fd5f06cbdb3bb47ce54bdbfa43257e6b2b789
Author: Josh Boyer <jwboyer@linux.vnet.ibm.com>
AuthorDate: Mon Dec 24 10:42:02 2007 -0600
Committer: Josh Boyer <jwboyer@linux.vnet.ibm.com>
CommitDate: Mon Dec 24 10:42:02 2007 -0600
[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>
---
arch/powerpc/platforms/40x/ep405.c | 5 +----
arch/powerpc/platforms/40x/kilauea.c | 5 +----
arch/powerpc/platforms/40x/makalu.c | 5 +----
arch/powerpc/platforms/40x/virtex.c | 5 +----
arch/powerpc/platforms/40x/walnut.c | 5 +----
arch/powerpc/platforms/44x/bamboo.c | 5 +----
arch/powerpc/platforms/44x/ebony.c | 5 +----
arch/powerpc/platforms/44x/katmai.c | 5 +----
arch/powerpc/platforms/44x/rainier.c | 5 +----
arch/powerpc/platforms/44x/sequoia.c | 5 +----
arch/powerpc/platforms/44x/taishan.c | 5 +----
11 files changed, 11 insertions(+), 44 deletions(-)
diff --git a/arch/powerpc/platforms/40x/ep405.c b/arch/powerpc/platforms/40x/ep405.c
index 8f73b62..13d1345 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 a233680..f9206a7 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 68bad77..4e4df72 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 14bbc32..43fcc8e 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 a968e88..f115b6d 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)
{
diff --git a/arch/powerpc/platforms/44x/bamboo.c b/arch/powerpc/platforms/44x/bamboo.c
index d27f758..fb9a22a 100644
--- a/arch/powerpc/platforms/44x/bamboo.c
+++ b/arch/powerpc/platforms/44x/bamboo.c
@@ -34,14 +34,11 @@ static __initdata struct of_device_id bamboo_of_bus[] = {
static int __init bamboo_device_probe(void)
{
- if (!machine_is(bamboo))
- return 0;
-
of_platform_bus_probe(NULL, bamboo_of_bus, NULL);
return 0;
}
-device_initcall(bamboo_device_probe);
+machine_device_initcall(bamboo, bamboo_device_probe);
static int __init bamboo_probe(void)
{
diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c
index 767db4f..481a016 100644
--- a/arch/powerpc/platforms/44x/ebony.c
+++ b/arch/powerpc/platforms/44x/ebony.c
@@ -37,14 +37,11 @@ static __initdata struct of_device_id ebony_of_bus[] = {
static int __init ebony_device_probe(void)
{
- if (!machine_is(ebony))
- return 0;
-
of_platform_bus_probe(NULL, ebony_of_bus, NULL);
return 0;
}
-device_initcall(ebony_device_probe);
+machine_device_initcall(ebony, ebony_device_probe);
/*
* Called very early, MMU is off, device-tree isn't unflattened
diff --git a/arch/powerpc/platforms/44x/katmai.c b/arch/powerpc/platforms/44x/katmai.c
index 06aa0aa..1113412 100644
--- a/arch/powerpc/platforms/44x/katmai.c
+++ b/arch/powerpc/platforms/44x/katmai.c
@@ -34,14 +34,11 @@ static __initdata struct of_device_id katmai_of_bus[] = {
static int __init katmai_device_probe(void)
{
- if (!machine_is(katmai))
- return 0;
-
of_platform_bus_probe(NULL, katmai_of_bus, NULL);
return 0;
}
-device_initcall(katmai_device_probe);
+machine_device_initcall(katmai, katmai_device_probe);
static int __init katmai_probe(void)
{
diff --git a/arch/powerpc/platforms/44x/rainier.c b/arch/powerpc/platforms/44x/rainier.c
index 4e06039..a4ce5ba 100644
--- a/arch/powerpc/platforms/44x/rainier.c
+++ b/arch/powerpc/platforms/44x/rainier.c
@@ -32,14 +32,11 @@ static __initdata struct of_device_id rainier_of_bus[] = {
static int __init rainier_device_probe(void)
{
- if (!machine_is(rainier))
- return 0;
-
of_platform_bus_probe(NULL, rainier_of_bus, NULL);
return 0;
}
-device_initcall(rainier_device_probe);
+machine_device_initcall(rainier, rainier_device_probe);
static int __init rainier_probe(void)
{
diff --git a/arch/powerpc/platforms/44x/sequoia.c b/arch/powerpc/platforms/44x/sequoia.c
index 1326f0c..374f8c7 100644
--- a/arch/powerpc/platforms/44x/sequoia.c
+++ b/arch/powerpc/platforms/44x/sequoia.c
@@ -34,14 +34,11 @@ static __initdata struct of_device_id sequoia_of_bus[] = {
static int __init sequoia_device_probe(void)
{
- if (!machine_is(sequoia))
- return 0;
-
of_platform_bus_probe(NULL, sequoia_of_bus, NULL);
return 0;
}
-device_initcall(sequoia_device_probe);
+machien_device_initcall(sequoia, sequoia_device_probe);
static int __init sequoia_probe(void)
{
diff --git a/arch/powerpc/platforms/44x/taishan.c b/arch/powerpc/platforms/44x/taishan.c
index d525f48..28ab7e2 100644
--- a/arch/powerpc/platforms/44x/taishan.c
+++ b/arch/powerpc/platforms/44x/taishan.c
@@ -41,14 +41,11 @@ static __initdata struct of_device_id taishan_of_bus[] = {
static int __init taishan_device_probe(void)
{
- if (!machine_is(taishan))
- return 0;
-
of_platform_bus_probe(NULL, taishan_of_bus, NULL);
return 0;
}
-device_initcall(taishan_device_probe);
+machine_device_initcall(taishan, taishan_device_probe);
/*
* Called very early, MMU is off, device-tree isn't unflattened
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
