aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev/xics
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2015-04-04 04:28:50 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2015-04-10 06:02:49 -0400
commita7f4ee1fe93aa9ae191971be9324edb8f9fbcb4a (patch)
treed462b76619518d4d35a1cadb026297c77c2f7816 /arch/powerpc/sysdev/xics
parent7261b956b276aa97fbf60d00f1d7717d2ea6ee78 (diff)
powerpc: Drop return value of smp_ops->probe()
smp_ops->probe() is currently supposed to return the number of cpus in the system. The last actual usage of the value was removed in May 2007 in e147ec8f1808 "[POWERPC] Simplify smp_space_timers". We still passed the value around until June 2010 when even that was finally removed in c1aa687d499a "powerpc: Clean up obsolete code relating to decrementer and timebase". So drop that requirement, probe() now returns void, and update all implementations. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/sysdev/xics')
-rw-r--r--arch/powerpc/sysdev/xics/xics-common.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c
index 125743b58c70..878a54036a25 100644
--- a/arch/powerpc/sysdev/xics/xics-common.c
+++ b/arch/powerpc/sysdev/xics/xics-common.c
@@ -140,15 +140,13 @@ static void xics_request_ipi(void)
140 IRQF_PERCPU | IRQF_NO_THREAD, "IPI", NULL)); 140 IRQF_PERCPU | IRQF_NO_THREAD, "IPI", NULL));
141} 141}
142 142
143int __init xics_smp_probe(void) 143void __init xics_smp_probe(void)
144{ 144{
145 /* Setup cause_ipi callback based on which ICP is used */ 145 /* Setup cause_ipi callback based on which ICP is used */
146 smp_ops->cause_ipi = icp_ops->cause_ipi; 146 smp_ops->cause_ipi = icp_ops->cause_ipi;
147 147
148 /* Register all the IPIs */ 148 /* Register all the IPIs */
149 xics_request_ipi(); 149 xics_request_ipi();
150
151 return num_possible_cpus();
152} 150}
153 151
154#endif /* CONFIG_SMP */ 152#endif /* CONFIG_SMP */