]> err.no Git - linux-2.6/commitdiff
[PATCH] powerpc: Avoid __initcall warnings
authorAnton Blanchard <anton@samba.org>
Sun, 2 Apr 2006 10:18:32 +0000 (20:18 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 13 Apr 2006 16:27:26 +0000 (09:27 -0700)
Fix __initcall return in proc_rtas_init and rtas_init.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/rtas-proc.c
arch/powerpc/platforms/pseries/rtasd.c

index 456286cf1d143cd8f6ca3ee9bf12af459620c1ce..9c9ad1fa9cce90748c7362d5dea5d744cdd84f08 100644 (file)
@@ -258,11 +258,11 @@ static int __init proc_rtas_init(void)
        struct proc_dir_entry *entry;
 
        if (!machine_is(pseries))
-               return 1;
+               return -ENODEV;
 
        rtas_node = of_find_node_by_name(NULL, "rtas");
        if (rtas_node == NULL)
-               return 1;
+               return -ENODEV;
 
        entry = create_proc_entry("ppc64/rtas/progress", S_IRUGO|S_IWUSR, NULL);
        if (entry)
index fcc4d561a23653a659775efd27f9f8c4ccd75d4b..e0000ce769e51831db5df3fe82f25d57384c1e16 100644 (file)
@@ -488,7 +488,7 @@ static int __init rtas_init(void)
        /* No RTAS */
        if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) {
                printk(KERN_INFO "rtasd: no event-scan on system\n");
-               return 1;
+               return -ENODEV;
        }
 
        entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL);