aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2014-05-27 04:56:23 -0400
committerRalf Baechle <ralf@linux-mips.org>2014-05-27 05:06:42 -0400
commit1461df59f0de0ecdebf9db090164d793e5b94442 (patch)
tree01a5abd7b29e050980b49146cfccce1abe21e7af
parent1d530fa42a317deca1c4a4780d18e2dbf316e0cb (diff)
MIPS: SMP: Remove plat_smp_ops cpus_done method.
Nothing was using the method and there isn't any need for this hook. This leaves smp_cpus_done() empty for the moment. As suggested by Paul Bolle <pebolle@tiscali.nl>. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/cavium-octeon/smp.c8
-rw-r--r--arch/mips/include/asm/cmp.h1
-rw-r--r--arch/mips/include/asm/smp-ops.h1
-rw-r--r--arch/mips/kernel/smp-bmips.c9
-rw-r--r--arch/mips/kernel/smp-cmp.c6
-rw-r--r--arch/mips/kernel/smp-cps.c5
-rw-r--r--arch/mips/kernel/smp-mt.c5
-rw-r--r--arch/mips/kernel/smp-up.c6
-rw-r--r--arch/mips/kernel/smp.c1
-rw-r--r--arch/mips/loongson/loongson-3/smp.c8
-rw-r--r--arch/mips/netlogic/common/smp.c5
-rw-r--r--arch/mips/sgi-ip27/ip27-smp.c5
-rw-r--r--arch/mips/sibyte/bcm1480/smp.c8
-rw-r--r--arch/mips/sibyte/sb1250/smp.c8
14 files changed, 0 insertions, 76 deletions
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index 78e1abebc854..a7b3ae104d8c 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -225,13 +225,6 @@ static void octeon_smp_finish(void)
225 local_irq_enable(); 225 local_irq_enable();
226} 226}
227 227
228/**
229 * Hook for after all CPUs are online
230 */
231static void octeon_cpus_done(void)
232{
233}
234
235#ifdef CONFIG_HOTPLUG_CPU 228#ifdef CONFIG_HOTPLUG_CPU
236 229
237/* State of each CPU. */ 230/* State of each CPU. */
@@ -388,7 +381,6 @@ struct plat_smp_ops octeon_smp_ops = {
388 .send_ipi_mask = octeon_send_ipi_mask, 381 .send_ipi_mask = octeon_send_ipi_mask,
389 .init_secondary = octeon_init_secondary, 382 .init_secondary = octeon_init_secondary,
390 .smp_finish = octeon_smp_finish, 383 .smp_finish = octeon_smp_finish,
391 .cpus_done = octeon_cpus_done,
392 .boot_secondary = octeon_boot_secondary, 384 .boot_secondary = octeon_boot_secondary,
393 .smp_setup = octeon_smp_setup, 385 .smp_setup = octeon_smp_setup,
394 .prepare_cpus = octeon_prepare_cpus, 386 .prepare_cpus = octeon_prepare_cpus,
diff --git a/arch/mips/include/asm/cmp.h b/arch/mips/include/asm/cmp.h
index 89a73fb93ae6..033d97303c85 100644
--- a/arch/mips/include/asm/cmp.h
+++ b/arch/mips/include/asm/cmp.h
@@ -10,7 +10,6 @@ extern void cmp_smp_setup(void);
10extern void cmp_smp_finish(void); 10extern void cmp_smp_finish(void);
11extern void cmp_boot_secondary(int cpu, struct task_struct *t); 11extern void cmp_boot_secondary(int cpu, struct task_struct *t);
12extern void cmp_init_secondary(void); 12extern void cmp_init_secondary(void);
13extern void cmp_cpus_done(void);
14extern void cmp_prepare_cpus(unsigned int max_cpus); 13extern void cmp_prepare_cpus(unsigned int max_cpus);
15 14
16/* This is platform specific */ 15/* This is platform specific */
diff --git a/arch/mips/include/asm/smp-ops.h b/arch/mips/include/asm/smp-ops.h
index 73d35b18fb64..6ba1fb8b11e2 100644
--- a/arch/mips/include/asm/smp-ops.h
+++ b/arch/mips/include/asm/smp-ops.h
@@ -26,7 +26,6 @@ struct plat_smp_ops {
26 void (*send_ipi_mask)(const struct cpumask *mask, unsigned int action); 26 void (*send_ipi_mask)(const struct cpumask *mask, unsigned int action);
27 void (*init_secondary)(void); 27 void (*init_secondary)(void);
28 void (*smp_finish)(void); 28 void (*smp_finish)(void);
29 void (*cpus_done)(void);
30 void (*boot_secondary)(int cpu, struct task_struct *idle); 29 void (*boot_secondary)(int cpu, struct task_struct *idle);
31 void (*smp_setup)(void); 30 void (*smp_setup)(void);
32 void (*prepare_cpus)(unsigned int max_cpus); 31 void (*prepare_cpus)(unsigned int max_cpus);
diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c
index ea4c2dc31692..df9e2bd9b2c2 100644
--- a/arch/mips/kernel/smp-bmips.c
+++ b/arch/mips/kernel/smp-bmips.c
@@ -281,13 +281,6 @@ static void bmips_smp_finish(void)
281} 281}
282 282
283/* 283/*
284 * Runs on CPU0 after all CPUs have been booted
285 */
286static void bmips_cpus_done(void)
287{
288}
289
290/*
291 * BMIPS5000 raceless IPIs 284 * BMIPS5000 raceless IPIs
292 * 285 *
293 * Each CPU has two inbound SW IRQs which are independent of all other CPUs. 286 * Each CPU has two inbound SW IRQs which are independent of all other CPUs.
@@ -434,7 +427,6 @@ struct plat_smp_ops bmips43xx_smp_ops = {
434 .boot_secondary = bmips_boot_secondary, 427 .boot_secondary = bmips_boot_secondary,
435 .smp_finish = bmips_smp_finish, 428 .smp_finish = bmips_smp_finish,
436 .init_secondary = bmips_init_secondary, 429 .init_secondary = bmips_init_secondary,
437 .cpus_done = bmips_cpus_done,
438 .send_ipi_single = bmips43xx_send_ipi_single, 430 .send_ipi_single = bmips43xx_send_ipi_single,
439 .send_ipi_mask = bmips43xx_send_ipi_mask, 431 .send_ipi_mask = bmips43xx_send_ipi_mask,
440#ifdef CONFIG_HOTPLUG_CPU 432#ifdef CONFIG_HOTPLUG_CPU
@@ -449,7 +441,6 @@ struct plat_smp_ops bmips5000_smp_ops = {
449 .boot_secondary = bmips_boot_secondary, 441 .boot_secondary = bmips_boot_secondary,
450 .smp_finish = bmips_smp_finish, 442 .smp_finish = bmips_smp_finish,
451 .init_secondary = bmips_init_secondary, 443 .init_secondary = bmips_init_secondary,
452 .cpus_done = bmips_cpus_done,
453 .send_ipi_single = bmips5000_send_ipi_single, 444 .send_ipi_single = bmips5000_send_ipi_single,
454 .send_ipi_mask = bmips5000_send_ipi_mask, 445 .send_ipi_mask = bmips5000_send_ipi_mask,
455#ifdef CONFIG_HOTPLUG_CPU 446#ifdef CONFIG_HOTPLUG_CPU
diff --git a/arch/mips/kernel/smp-cmp.c b/arch/mips/kernel/smp-cmp.c
index 64d06f6a9adf..fc8a51553426 100644
--- a/arch/mips/kernel/smp-cmp.c
+++ b/arch/mips/kernel/smp-cmp.c
@@ -72,11 +72,6 @@ static void cmp_smp_finish(void)
72 local_irq_enable(); 72 local_irq_enable();
73} 73}
74 74
75static void cmp_cpus_done(void)
76{
77 pr_debug("SMPCMP: CPU%d: %s\n", smp_processor_id(), __func__);
78}
79
80/* 75/*
81 * Setup the PC, SP, and GP of a secondary processor and start it running 76 * Setup the PC, SP, and GP of a secondary processor and start it running
82 * smp_bootstrap is the place to resume from 77 * smp_bootstrap is the place to resume from
@@ -158,7 +153,6 @@ struct plat_smp_ops cmp_smp_ops = {
158 .send_ipi_mask = gic_send_ipi_mask, 153 .send_ipi_mask = gic_send_ipi_mask,
159 .init_secondary = cmp_init_secondary, 154 .init_secondary = cmp_init_secondary,
160 .smp_finish = cmp_smp_finish, 155 .smp_finish = cmp_smp_finish,
161 .cpus_done = cmp_cpus_done,
162 .boot_secondary = cmp_boot_secondary, 156 .boot_secondary = cmp_boot_secondary,
163 .smp_setup = cmp_smp_setup, 157 .smp_setup = cmp_smp_setup,
164 .prepare_cpus = cmp_prepare_cpus, 158 .prepare_cpus = cmp_prepare_cpus,
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c
index 536eec0d21b6..bb36b4e6b55f 100644
--- a/arch/mips/kernel/smp-cps.c
+++ b/arch/mips/kernel/smp-cps.c
@@ -302,10 +302,6 @@ static void cps_smp_finish(void)
302 local_irq_enable(); 302 local_irq_enable();
303} 303}
304 304
305static void cps_cpus_done(void)
306{
307}
308
309static struct plat_smp_ops cps_smp_ops = { 305static struct plat_smp_ops cps_smp_ops = {
310 .smp_setup = cps_smp_setup, 306 .smp_setup = cps_smp_setup,
311 .prepare_cpus = cps_prepare_cpus, 307 .prepare_cpus = cps_prepare_cpus,
@@ -314,7 +310,6 @@ static struct plat_smp_ops cps_smp_ops = {
314 .smp_finish = cps_smp_finish, 310 .smp_finish = cps_smp_finish,
315 .send_ipi_single = gic_send_ipi_single, 311 .send_ipi_single = gic_send_ipi_single,
316 .send_ipi_mask = gic_send_ipi_mask, 312 .send_ipi_mask = gic_send_ipi_mask,
317 .cpus_done = cps_cpus_done,
318}; 313};
319 314
320int register_cps_smp_ops(void) 315int register_cps_smp_ops(void)
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index f8e13149604d..3babf6e4f894 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -183,10 +183,6 @@ static void vsmp_smp_finish(void)
183 local_irq_enable(); 183 local_irq_enable();
184} 184}
185 185
186static void vsmp_cpus_done(void)
187{
188}
189
190/* 186/*
191 * Setup the PC, SP, and GP of a secondary processor and start it 187 * Setup the PC, SP, and GP of a secondary processor and start it
192 * running! 188 * running!
@@ -287,7 +283,6 @@ struct plat_smp_ops vsmp_smp_ops = {
287 .send_ipi_mask = vsmp_send_ipi_mask, 283 .send_ipi_mask = vsmp_send_ipi_mask,
288 .init_secondary = vsmp_init_secondary, 284 .init_secondary = vsmp_init_secondary,
289 .smp_finish = vsmp_smp_finish, 285 .smp_finish = vsmp_smp_finish,
290 .cpus_done = vsmp_cpus_done,
291 .boot_secondary = vsmp_boot_secondary, 286 .boot_secondary = vsmp_boot_secondary,
292 .smp_setup = vsmp_smp_setup, 287 .smp_setup = vsmp_smp_setup,
293 .prepare_cpus = vsmp_prepare_cpus, 288 .prepare_cpus = vsmp_prepare_cpus,
diff --git a/arch/mips/kernel/smp-up.c b/arch/mips/kernel/smp-up.c
index 7fde3e4d978f..17878d71ef2b 100644
--- a/arch/mips/kernel/smp-up.c
+++ b/arch/mips/kernel/smp-up.c
@@ -36,11 +36,6 @@ static void up_smp_finish(void)
36{ 36{
37} 37}
38 38
39/* Hook for after all CPUs are online */
40static void up_cpus_done(void)
41{
42}
43
44/* 39/*
45 * Firmware CPU startup hook 40 * Firmware CPU startup hook
46 */ 41 */
@@ -73,7 +68,6 @@ struct plat_smp_ops up_smp_ops = {
73 .send_ipi_mask = up_send_ipi_mask, 68 .send_ipi_mask = up_send_ipi_mask,
74 .init_secondary = up_init_secondary, 69 .init_secondary = up_init_secondary,
75 .smp_finish = up_smp_finish, 70 .smp_finish = up_smp_finish,
76 .cpus_done = up_cpus_done,
77 .boot_secondary = up_boot_secondary, 71 .boot_secondary = up_boot_secondary,
78 .smp_setup = up_smp_setup, 72 .smp_setup = up_smp_setup,
79 .prepare_cpus = up_prepare_cpus, 73 .prepare_cpus = up_prepare_cpus,
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 35bb05a13f05..ce7677523b68 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -163,7 +163,6 @@ void smp_send_stop(void)
163 163
164void __init smp_cpus_done(unsigned int max_cpus) 164void __init smp_cpus_done(unsigned int max_cpus)
165{ 165{
166 mp_ops->cpus_done();
167} 166}
168 167
169/* called from main before smp_init() */ 168/* called from main before smp_init() */
diff --git a/arch/mips/loongson/loongson-3/smp.c b/arch/mips/loongson/loongson-3/smp.c
index c665fe16d4c9..1e8894020ea5 100644
--- a/arch/mips/loongson/loongson-3/smp.c
+++ b/arch/mips/loongson/loongson-3/smp.c
@@ -279,13 +279,6 @@ static void loongson3_boot_secondary(int cpu, struct task_struct *idle)
279 loongson3_ipi_write64(startargs[0], (void *)(ipi_mailbox_buf[cpu]+0x0)); 279 loongson3_ipi_write64(startargs[0], (void *)(ipi_mailbox_buf[cpu]+0x0));
280} 280}
281 281
282/*
283 * Final cleanup after all secondaries booted
284 */
285static void __init loongson3_cpus_done(void)
286{
287}
288
289#ifdef CONFIG_HOTPLUG_CPU 282#ifdef CONFIG_HOTPLUG_CPU
290 283
291static int loongson3_cpu_disable(void) 284static int loongson3_cpu_disable(void)
@@ -432,7 +425,6 @@ struct plat_smp_ops loongson3_smp_ops = {
432 .send_ipi_mask = loongson3_send_ipi_mask, 425 .send_ipi_mask = loongson3_send_ipi_mask,
433 .init_secondary = loongson3_init_secondary, 426 .init_secondary = loongson3_init_secondary,
434 .smp_finish = loongson3_smp_finish, 427 .smp_finish = loongson3_smp_finish,
435 .cpus_done = loongson3_cpus_done,
436 .boot_secondary = loongson3_boot_secondary, 428 .boot_secondary = loongson3_boot_secondary,
437 .smp_setup = loongson3_smp_setup, 429 .smp_setup = loongson3_smp_setup,
438 .prepare_cpus = loongson3_prepare_cpus, 430 .prepare_cpus = loongson3_prepare_cpus,
diff --git a/arch/mips/netlogic/common/smp.c b/arch/mips/netlogic/common/smp.c
index 6baae15cc7b1..d81b443188af 100644
--- a/arch/mips/netlogic/common/smp.c
+++ b/arch/mips/netlogic/common/smp.c
@@ -135,10 +135,6 @@ void nlm_smp_finish(void)
135 local_irq_enable(); 135 local_irq_enable();
136} 136}
137 137
138void nlm_cpus_done(void)
139{
140}
141
142/* 138/*
143 * Boot all other cpus in the system, initialize them, and bring them into 139 * Boot all other cpus in the system, initialize them, and bring them into
144 * the boot function 140 * the boot function
@@ -277,7 +273,6 @@ struct plat_smp_ops nlm_smp_ops = {
277 .send_ipi_mask = nlm_send_ipi_mask, 273 .send_ipi_mask = nlm_send_ipi_mask,
278 .init_secondary = nlm_init_secondary, 274 .init_secondary = nlm_init_secondary,
279 .smp_finish = nlm_smp_finish, 275 .smp_finish = nlm_smp_finish,
280 .cpus_done = nlm_cpus_done,
281 .boot_secondary = nlm_boot_secondary, 276 .boot_secondary = nlm_boot_secondary,
282 .smp_setup = nlm_smp_setup, 277 .smp_setup = nlm_smp_setup,
283 .prepare_cpus = nlm_prepare_cpus, 278 .prepare_cpus = nlm_prepare_cpus,
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index f4ea8aa79ba2..f9ae6a8fa7c7 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -186,10 +186,6 @@ static void ip27_smp_finish(void)
186 local_irq_enable(); 186 local_irq_enable();
187} 187}
188 188
189static void __init ip27_cpus_done(void)
190{
191}
192
193/* 189/*
194 * Launch a slave into smp_bootstrap(). It doesn't take an argument, and we 190 * Launch a slave into smp_bootstrap(). It doesn't take an argument, and we
195 * set sp to the kernel stack of the newly created idle process, gp to the proc 191 * set sp to the kernel stack of the newly created idle process, gp to the proc
@@ -236,7 +232,6 @@ struct plat_smp_ops ip27_smp_ops = {
236 .send_ipi_mask = ip27_send_ipi_mask, 232 .send_ipi_mask = ip27_send_ipi_mask,
237 .init_secondary = ip27_init_secondary, 233 .init_secondary = ip27_init_secondary,
238 .smp_finish = ip27_smp_finish, 234 .smp_finish = ip27_smp_finish,
239 .cpus_done = ip27_cpus_done,
240 .boot_secondary = ip27_boot_secondary, 235 .boot_secondary = ip27_boot_secondary,
241 .smp_setup = ip27_smp_setup, 236 .smp_setup = ip27_smp_setup,
242 .prepare_cpus = ip27_prepare_cpus, 237 .prepare_cpus = ip27_prepare_cpus,
diff --git a/arch/mips/sibyte/bcm1480/smp.c b/arch/mips/sibyte/bcm1480/smp.c
index 70d9182b26f1..af7d44edd9a8 100644
--- a/arch/mips/sibyte/bcm1480/smp.c
+++ b/arch/mips/sibyte/bcm1480/smp.c
@@ -115,13 +115,6 @@ static void bcm1480_smp_finish(void)
115} 115}
116 116
117/* 117/*
118 * Final cleanup after all secondaries booted
119 */
120static void bcm1480_cpus_done(void)
121{
122}
123
124/*
125 * Setup the PC, SP, and GP of a secondary processor and start it 118 * Setup the PC, SP, and GP of a secondary processor and start it
126 * running! 119 * running!
127 */ 120 */
@@ -170,7 +163,6 @@ struct plat_smp_ops bcm1480_smp_ops = {
170 .send_ipi_mask = bcm1480_send_ipi_mask, 163 .send_ipi_mask = bcm1480_send_ipi_mask,
171 .init_secondary = bcm1480_init_secondary, 164 .init_secondary = bcm1480_init_secondary,
172 .smp_finish = bcm1480_smp_finish, 165 .smp_finish = bcm1480_smp_finish,
173 .cpus_done = bcm1480_cpus_done,
174 .boot_secondary = bcm1480_boot_secondary, 166 .boot_secondary = bcm1480_boot_secondary,
175 .smp_setup = bcm1480_smp_setup, 167 .smp_setup = bcm1480_smp_setup,
176 .prepare_cpus = bcm1480_prepare_cpus, 168 .prepare_cpus = bcm1480_prepare_cpus,
diff --git a/arch/mips/sibyte/sb1250/smp.c b/arch/mips/sibyte/sb1250/smp.c
index db976117dd4d..c0c4b3f88a08 100644
--- a/arch/mips/sibyte/sb1250/smp.c
+++ b/arch/mips/sibyte/sb1250/smp.c
@@ -103,13 +103,6 @@ static void sb1250_smp_finish(void)
103} 103}
104 104
105/* 105/*
106 * Final cleanup after all secondaries booted
107 */
108static void sb1250_cpus_done(void)
109{
110}
111
112/*
113 * Setup the PC, SP, and GP of a secondary processor and start it 106 * Setup the PC, SP, and GP of a secondary processor and start it
114 * running! 107 * running!
115 */ 108 */
@@ -158,7 +151,6 @@ struct plat_smp_ops sb_smp_ops = {
158 .send_ipi_mask = sb1250_send_ipi_mask, 151 .send_ipi_mask = sb1250_send_ipi_mask,
159 .init_secondary = sb1250_init_secondary, 152 .init_secondary = sb1250_init_secondary,
160 .smp_finish = sb1250_smp_finish, 153 .smp_finish = sb1250_smp_finish,
161 .cpus_done = sb1250_cpus_done,
162 .boot_secondary = sb1250_boot_secondary, 154 .boot_secondary = sb1250_boot_secondary,
163 .smp_setup = sb1250_smp_setup, 155 .smp_setup = sb1250_smp_setup,
164 .prepare_cpus = sb1250_prepare_cpus, 156 .prepare_cpus = sb1250_prepare_cpus,