[PATCH] powerpc: Fix some initcall return values

Non zero initcalls (except for -ENODEV) have started warning at boot.
Fix smt_setup and init_ras_IRQ.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 0f0c3a9ae2e5df8017d2018098206f0f344eb7a3..aca2f09cd8429463d77f0ee26bece1364d096419 100644 (file)
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -65,11 +65,11 @@ static int __init smt_setup(void)
        unsigned int cpu;
 
        if (!cpu_has_feature(CPU_FTR_SMT))
-               return 1;
+               return -ENODEV;
 
        options = find_path_device("/options");
        if (!options)
-               return 1;
+               return -ENODEV;
 
        val = (unsigned int *)get_property(options, "ibm,smt-snooze-delay",
                                           NULL);
@@ -78,7 +78,7 @@ static int __init smt_setup(void)
                        per_cpu(smt_snooze_delay, cpu) = *val;
        }
 
-       return 1;
+       return 0;
 }
 __initcall(smt_setup);
 

diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index b046bcf7443d4e51048e91de3004876ed7111380..9639c66b453d3542d2adb62ad2a67f044b8ea7f4 100644 (file)
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -132,7 +132,7 @@ static int __init init_ras_IRQ(void)
                of_node_put(np);
        }
 
-       return 1;
+       return 0;
 }
 __initcall(init_ras_IRQ);