diff --git a/arch/powerpc/platforms/40x/ep405.c b/arch/powerpc/platforms/40x/ep405.c
index 8f73b6222e8b243b34b2d7851257df3e81ebc967..13d1345026daebff6f8e1eb55662157d93aee9f0 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 a23368042e67b017907e724d77462a99e9588938..f9206a7fede08f51b1e5823245379564869ed931 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 68bad77645229e3b2d70f3aa65d11b21ee5ae916..4e4df72fc9cd79ea3a5fec664cdd4c84aef46161 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 14bbc328170fd76e26e1a5479b2aded9794e802a..43fcc8e9f7d0f7610c73333fe86162ad47134247 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 a968e88a58a74ddd958f017eec2b5e18422bf06a..f115b6dbf5ad26f6609fb137f3b87fa996e78529 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 d27f758d9cb2338c9c567d108b4f95a318c5d5e6..fb9a22a7e8d085c18dc5ada58067207541947b57 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 767db4f9fc2c3b16edee02207bceb49dd3b6b427..481a016e153506eea25d60e336e254f5a87ffa2b 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 06aa0aa3cf0e8175fc914dd96e51ec744d532d56..11134121f272d36f33687d84091cadb0bc078017 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 4e06039ec66531991e1fa32e2d1176bbaa198336..a4ce5ba8fe3282a4eac93f7837363511e2bfce96 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 1326f0c6871222cb99620a6bfd1ba4bc4dcfdfe8..374f8c7fcd01353711cff0a49996c0a36b06368b 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 d525f487e2448c57ca17bc995e23feece189cdd2..28ab7e2e02c391b024292b560180bd060aef5116 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