浏览代码

[POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Kumar Gala 17 年之前
父节点
当前提交
77b41597e8
共有 2 个文件被更改,包括 4 次插入8 次删除
  1. 2 4
      arch/powerpc/platforms/85xx/sbc8548.c
  2. 2 4
      arch/powerpc/platforms/85xx/sbc8560.c

+ 2 - 4
arch/powerpc/platforms/85xx/sbc8548.c

@@ -135,13 +135,11 @@ static struct of_device_id __initdata of_bus_ids[] = {
 
 static int __init declare_of_platform_devices(void)
 {
-	if (!machine_is(sbc8548))
-		return 0;
-
 	of_platform_bus_probe(NULL, of_bus_ids, NULL);
+
 	return 0;
 }
-device_initcall(declare_of_platform_devices);
+machine_device_initcall(sbc8548, declare_of_platform_devices);
 
 /*
  * Called very early, device-tree isn't unflattened

+ 2 - 4
arch/powerpc/platforms/85xx/sbc8560.c

@@ -222,13 +222,11 @@ static struct of_device_id __initdata of_bus_ids[] = {
 
 static int __init declare_of_platform_devices(void)
 {
-	if (!machine_is(sbc8560))
-		return 0;
-
 	of_platform_bus_probe(NULL, of_bus_ids, NULL);
+
 	return 0;
 }
-device_initcall(declare_of_platform_devices);
+machine_device_initcall(sbc8560, declare_of_platform_devices);
 
 /*
  * Called very early, device-tree isn't unflattened