diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-04 04:28:50 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-10 06:02:49 -0400 |
commit | a7f4ee1fe93aa9ae191971be9324edb8f9fbcb4a (patch) | |
tree | d462b76619518d4d35a1cadb026297c77c2f7816 /arch/powerpc/platforms/pseries | |
parent | 7261b956b276aa97fbf60d00f1d7717d2ea6ee78 (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/platforms/pseries')
-rw-r--r-- | arch/powerpc/platforms/pseries/smp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c index a3555b10c1a5..6932ea803e33 100644 --- a/arch/powerpc/platforms/pseries/smp.c +++ b/arch/powerpc/platforms/pseries/smp.c | |||
@@ -197,16 +197,14 @@ static void pSeries_cause_ipi_mux(int cpu, unsigned long data) | |||
197 | xics_cause_ipi(cpu, data); | 197 | xics_cause_ipi(cpu, data); |
198 | } | 198 | } |
199 | 199 | ||
200 | static __init int pSeries_smp_probe(void) | 200 | static __init void pSeries_smp_probe(void) |
201 | { | 201 | { |
202 | int ret = xics_smp_probe(); | 202 | xics_smp_probe(); |
203 | 203 | ||
204 | if (cpu_has_feature(CPU_FTR_DBELL)) { | 204 | if (cpu_has_feature(CPU_FTR_DBELL)) { |
205 | xics_cause_ipi = smp_ops->cause_ipi; | 205 | xics_cause_ipi = smp_ops->cause_ipi; |
206 | smp_ops->cause_ipi = pSeries_cause_ipi_mux; | 206 | smp_ops->cause_ipi = pSeries_cause_ipi_mux; |
207 | } | 207 | } |
208 | |||
209 | return ret; | ||
210 | } | 208 | } |
211 | 209 | ||
212 | static struct smp_ops_t pSeries_mpic_smp_ops = { | 210 | static struct smp_ops_t pSeries_mpic_smp_ops = { |