aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2015-04-14 15:52:50 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2015-04-15 01:52:59 -0400
commit2fe0753d49402aee325cc39c476b46fd51a8afec (patch)
tree47b82b1a5aee26048bb7612e102e7a7ad0faa5b4 /arch/powerpc/platforms
parent16e00f5a5f12eb32ca39df6a7afd5c0062705af6 (diff)
powerpc/powermac: Fix build error seen with powermac smp builds
powermac smp builds fail with arch/powerpc/platforms/powermac/smp.c: In function 'smp_psurge_probe': arch/powerpc/platforms/powermac/smp.c:278:3: error: 'return' with a value, in function returning void There are several instances of this error. Fixes: a7f4ee1fe93a ("powerpc: Drop return value of smp_ops->probe()") Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r--arch/powerpc/platforms/powermac/smp.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index f84ac7ee1107..28a147ca32ba 100644
--- 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)
275 275
276 /* We don't do SMP on the PPC601 -- paulus */ 276 /* We don't do SMP on the PPC601 -- paulus */
277 if (PVR_VER(mfspr(SPRN_PVR)) == 1) 277 if (PVR_VER(mfspr(SPRN_PVR)) == 1)
278 return 1; 278 return;
279 279
280 /* 280 /*
281 * The powersurge cpu board can be used in the generation 281 * The powersurge cpu board can be used in the generation
@@ -289,7 +289,7 @@ static void __init smp_psurge_probe(void)
289 */ 289 */
290 dn = of_find_node_by_name(NULL, "hammerhead"); 290 dn = of_find_node_by_name(NULL, "hammerhead");
291 if (dn == NULL) 291 if (dn == NULL)
292 return 1; 292 return;
293 of_node_put(dn); 293 of_node_put(dn);
294 294
295 hhead_base = ioremap(HAMMERHEAD_BASE, 0x800); 295 hhead_base = ioremap(HAMMERHEAD_BASE, 0x800);
@@ -310,13 +310,13 @@ static void __init smp_psurge_probe(void)
310 /* not a dual-cpu card */ 310 /* not a dual-cpu card */
311 iounmap(hhead_base); 311 iounmap(hhead_base);
312 psurge_type = PSURGE_NONE; 312 psurge_type = PSURGE_NONE;
313 return 1; 313 return;
314 } 314 }
315 ncpus = 2; 315 ncpus = 2;
316 } 316 }
317 317
318 if (psurge_secondary_ipi_init()) 318 if (psurge_secondary_ipi_init())
319 return 1; 319 return;
320 320
321 psurge_start = ioremap(PSURGE_START, 4); 321 psurge_start = ioremap(PSURGE_START, 4);
322 psurge_pri_intr = ioremap(PSURGE_PRI_INTR, 4); 322 psurge_pri_intr = ioremap(PSURGE_PRI_INTR, 4);
@@ -332,8 +332,6 @@ static void __init smp_psurge_probe(void)
332 set_cpu_present(i, true); 332 set_cpu_present(i, true);
333 333
334 if (ppc_md.progress) ppc_md.progress("smp_psurge_probe - done", 0x352); 334 if (ppc_md.progress) ppc_md.progress("smp_psurge_probe - done", 0x352);
335
336 return ncpus;
337} 335}
338 336
339static int __init smp_psurge_kick_cpu(int nr) 337static int __init smp_psurge_kick_cpu(int nr)