From 3f8c5c3b4d07fa24e7081a54798ddfab7360a102 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date: Mon, 24 Dec 2007 10:42:02 -0600
Subject: [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/44x/rainier.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'arch/powerpc/platforms/44x/rainier.c')

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)
 {
-- 
cgit v1.1