iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Guenter Roeck 2015-04-14 12:52:50 -07:00 committed by Michael Ellerman
parent 16e00f5a5f
commit 2fe0753d49
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/platforms/powermac/smp.c
View File

@ -275,7 +275,7 @@ static void __init smp_psurge_probe(void)
/* We don't do SMP on the PPC601 -- paulus */ /* We don't do SMP on the PPC601 -- paulus */
if (PVR_VER(mfspr(SPRN_PVR)) == 1) if (PVR_VER(mfspr(SPRN_PVR)) == 1)
return 1; return;
/* /*
* The powersurge cpu board can be used in the generation * 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"); dn = of_find_node_by_name(NULL, "hammerhead");
if (dn == NULL) if (dn == NULL)
return 1; return;
of_node_put(dn); of_node_put(dn);
hhead_base = ioremap(HAMMERHEAD_BASE, 0x800); hhead_base = ioremap(HAMMERHEAD_BASE, 0x800);
@ -310,13 +310,13 @@ static void __init smp_psurge_probe(void)
/* not a dual-cpu card */ /* not a dual-cpu card */
iounmap(hhead_base); iounmap(hhead_base);
psurge_type = PSURGE_NONE; psurge_type = PSURGE_NONE;
return 1; return;
} }
ncpus = 2; ncpus = 2;
} }
if (psurge_secondary_ipi_init()) if (psurge_secondary_ipi_init())
return 1; return;
psurge_start = ioremap(PSURGE_START, 4); psurge_start = ioremap(PSURGE_START, 4);
psurge_pri_intr = ioremap(PSURGE_PRI_INTR, 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); set_cpu_present(i, true);
if (ppc_md.progress) ppc_md.progress("smp_psurge_probe - done", 0x352); if (ppc_md.progress) ppc_md.progress("smp_psurge_probe - done", 0x352);
return ncpus;
} }
static int __init smp_psurge_kick_cpu(int nr) static int __init smp_psurge_kick_cpu(int nr)