powerpc/powermac: Fix build error seen with powermac smp builds

[cascardo/linux.git] / arch / powerpc / platforms / powermac / smp.c

diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index f84ac7e..28a147c 100644 (file)
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -275,7 +275,7 @@ static void __init smp_psurge_probe(void)
 
        /* We don't do SMP on the PPC601 -- paulus */
        if (PVR_VER(mfspr(SPRN_PVR)) == 1)
-               return 1;
+               return;
 
        /*
         * The powersurge cpu board can be used in the generation
@@ -289,7 +289,7 @@ static void __init smp_psurge_probe(void)
         */
        dn = of_find_node_by_name(NULL, "hammerhead");
        if (dn == NULL)
-               return 1;
+               return;
        of_node_put(dn);
 
        hhead_base = ioremap(HAMMERHEAD_BASE, 0x800);
@@ -310,13 +310,13 @@ static void __init smp_psurge_probe(void)
                        /* not a dual-cpu card */
                        iounmap(hhead_base);
                        psurge_type = PSURGE_NONE;
-                       return 1;
+                       return;
                }
                ncpus = 2;
        }
 
        if (psurge_secondary_ipi_init())
-               return 1;
+               return;
 
        psurge_start = ioremap(PSURGE_START, 4);
        psurge_pri_intr = ioremap(PSURGE_PRI_INTR, 4);
@@ -332,8 +332,6 @@ static void __init smp_psurge_probe(void)
                set_cpu_present(i, true);
 
        if (ppc_md.progress) ppc_md.progress("smp_psurge_probe - done", 0x352);
-
-       return ncpus;
 }
 
 static int __init smp_psurge_kick_cpu(int nr)