6 files changed, 6 insertions, 24 deletions

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