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>

diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index 78e1abebc854574c2e8420890c5b7d27ba7accd8..a7b3ae104d8cde43f768ec617a6b5042b9dd11ed 100644 (file)
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -225,13 +225,6 @@ static void octeon_smp_finish(void)
        local_irq_enable();
 }
 
-/**
- * Hook for after all CPUs are online
- */
-static void octeon_cpus_done(void)
-{
-}
-
 #ifdef CONFIG_HOTPLUG_CPU
 
 /* State of each CPU. */
@@ -388,7 +381,6 @@ struct plat_smp_ops octeon_smp_ops = {
        .send_ipi_mask          = octeon_send_ipi_mask,
        .init_secondary         = octeon_init_secondary,
        .smp_finish             = octeon_smp_finish,
-       .cpus_done              = octeon_cpus_done,
        .boot_secondary         = octeon_boot_secondary,
        .smp_setup              = octeon_smp_setup,
        .prepare_cpus           = octeon_prepare_cpus,

diff --git a/arch/mips/include/asm/cmp.h b/arch/mips/include/asm/cmp.h
index 89a73fb93ae6c9253f3a7fccff60d1f58983d843..033d97303c85675cf7516225bf8c5d1f8550eb0e 100644 (file)
--- a/arch/mips/include/asm/cmp.h
+++ b/arch/mips/include/asm/cmp.h
@@ -10,7 +10,6 @@ extern void cmp_smp_setup(void);
 extern void cmp_smp_finish(void);
 extern void cmp_boot_secondary(int cpu, struct task_struct *t);
 extern void cmp_init_secondary(void);
-extern void cmp_cpus_done(void);
 extern void cmp_prepare_cpus(unsigned int max_cpus);
 
 /* This is platform specific */

diff --git a/arch/mips/include/asm/smp-ops.h b/arch/mips/include/asm/smp-ops.h
index 73d35b18fb64420aed254a316003d8282a0c5360..6ba1fb8b11e225683cb32aafa959fdfcc73967c5 100644 (file)
--- a/arch/mips/include/asm/smp-ops.h
+++ b/arch/mips/include/asm/smp-ops.h
@@ -26,7 +26,6 @@ struct plat_smp_ops {
        void (*send_ipi_mask)(const struct cpumask *mask, unsigned int action);
        void (*init_secondary)(void);
        void (*smp_finish)(void);
-       void (*cpus_done)(void);
        void (*boot_secondary)(int cpu, struct task_struct *idle);
        void (*smp_setup)(void);
        void (*prepare_cpus)(unsigned int max_cpus);

diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c
index ea4c2dc316927476ce6ef86ff461d1ec28299327..df9e2bd9b2c292e0497cdd0daba5217589575c2c 100644 (file)
--- a/arch/mips/kernel/smp-bmips.c
+++ b/arch/mips/kernel/smp-bmips.c
@@ -280,13 +280,6 @@ static void bmips_smp_finish(void)
        irq_enable_hazard();
 }
 
-/*
- * Runs on CPU0 after all CPUs have been booted
- */
-static void bmips_cpus_done(void)
-{
-}
-
 /*
  * BMIPS5000 raceless IPIs
  *
@@ -434,7 +427,6 @@ struct plat_smp_ops bmips43xx_smp_ops = {
        .boot_secondary         = bmips_boot_secondary,
        .smp_finish             = bmips_smp_finish,
        .init_secondary         = bmips_init_secondary,
-       .cpus_done              = bmips_cpus_done,
        .send_ipi_single        = bmips43xx_send_ipi_single,
        .send_ipi_mask          = bmips43xx_send_ipi_mask,
 #ifdef CONFIG_HOTPLUG_CPU
@@ -449,7 +441,6 @@ struct plat_smp_ops bmips5000_smp_ops = {
        .boot_secondary         = bmips_boot_secondary,
        .smp_finish             = bmips_smp_finish,
        .init_secondary         = bmips_init_secondary,
-       .cpus_done              = bmips_cpus_done,
        .send_ipi_single        = bmips5000_send_ipi_single,
        .send_ipi_mask          = bmips5000_send_ipi_mask,
 #ifdef CONFIG_HOTPLUG_CPU

diff --git a/arch/mips/kernel/smp-cmp.c b/arch/mips/kernel/smp-cmp.c
index 64d06f6a9adf740a8ec578580d0dd8ca2778bbd5..fc8a5155342645321273a97e407af730ecbc9293 100644 (file)
--- a/arch/mips/kernel/smp-cmp.c
+++ b/arch/mips/kernel/smp-cmp.c
@@ -72,11 +72,6 @@ static void cmp_smp_finish(void)
        local_irq_enable();
 }
 
-static void cmp_cpus_done(void)
-{
-       pr_debug("SMPCMP: CPU%d: %s\n", smp_processor_id(), __func__);
-}
-
 /*
  * Setup the PC, SP, and GP of a secondary processor and start it running
  * smp_bootstrap is the place to resume from
@@ -158,7 +153,6 @@ struct plat_smp_ops cmp_smp_ops = {
        .send_ipi_mask          = gic_send_ipi_mask,
        .init_secondary         = cmp_init_secondary,
        .smp_finish             = cmp_smp_finish,
-       .cpus_done              = cmp_cpus_done,
        .boot_secondary         = cmp_boot_secondary,
        .smp_setup              = cmp_smp_setup,
        .prepare_cpus           = cmp_prepare_cpus,

diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c
index 536eec0d21b6f747440d20f565902e200567d0af..bb36b4e6b55f7f88de66d05d7acfd8fed74c1098 100644 (file)
--- a/arch/mips/kernel/smp-cps.c
+++ b/arch/mips/kernel/smp-cps.c
@@ -302,10 +302,6 @@ static void cps_smp_finish(void)
        local_irq_enable();
 }
 
-static void cps_cpus_done(void)
-{
-}
-
 static struct plat_smp_ops cps_smp_ops = {
        .smp_setup              = cps_smp_setup,
        .prepare_cpus           = cps_prepare_cpus,
@@ -314,7 +310,6 @@ static struct plat_smp_ops cps_smp_ops = {
        .smp_finish             = cps_smp_finish,
        .send_ipi_single        = gic_send_ipi_single,
        .send_ipi_mask          = gic_send_ipi_mask,
-       .cpus_done              = cps_cpus_done,
 };
 
 int register_cps_smp_ops(void)

diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index f8e13149604d74529dd746f889bf6a1345f4bf9e..3babf6e4f8940f7f8915e568cff06a78631a51fb 100644 (file)
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -183,10 +183,6 @@ static void vsmp_smp_finish(void)
        local_irq_enable();
 }
 
-static void vsmp_cpus_done(void)
-{
-}
-
 /*
  * Setup the PC, SP, and GP of a secondary processor and start it
  * running!
@@ -287,7 +283,6 @@ struct plat_smp_ops vsmp_smp_ops = {
        .send_ipi_mask          = vsmp_send_ipi_mask,
        .init_secondary         = vsmp_init_secondary,
        .smp_finish             = vsmp_smp_finish,
-       .cpus_done              = vsmp_cpus_done,
        .boot_secondary         = vsmp_boot_secondary,
        .smp_setup              = vsmp_smp_setup,
        .prepare_cpus           = vsmp_prepare_cpus,

diff --git a/arch/mips/kernel/smp-up.c b/arch/mips/kernel/smp-up.c
index 7fde3e4d978f98da02842d0da60d43720017f07e..17878d71ef2bc9f5238c7062b0f09cd5d1ca644b 100644 (file)
--- a/arch/mips/kernel/smp-up.c
+++ b/arch/mips/kernel/smp-up.c
@@ -36,11 +36,6 @@ static void up_smp_finish(void)
 {
 }
 
-/* Hook for after all CPUs are online */
-static void up_cpus_done(void)
-{
-}
-
 /*
  * Firmware CPU startup hook
  */
@@ -73,7 +68,6 @@ struct plat_smp_ops up_smp_ops = {
        .send_ipi_mask          = up_send_ipi_mask,
        .init_secondary         = up_init_secondary,
        .smp_finish             = up_smp_finish,
-       .cpus_done              = up_cpus_done,
        .boot_secondary         = up_boot_secondary,
        .smp_setup              = up_smp_setup,
        .prepare_cpus           = up_prepare_cpus,

diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 35bb05a13f054020f07306dec8c3f0335ababff7..ce7677523b68317530bec39be55357e27e7d2e50 100644 (file)
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -163,7 +163,6 @@ void smp_send_stop(void)
 
 void __init smp_cpus_done(unsigned int max_cpus)
 {
-       mp_ops->cpus_done();
 }
 
 /* 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 c665fe16d4c94046568e63a2a24bb6cb3614a836..1e8894020ea5f6d915006e471c0411d4037e5c0e 100644 (file)
--- 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)
        loongson3_ipi_write64(startargs[0], (void *)(ipi_mailbox_buf[cpu]+0x0));
 }
 
-/*
- * Final cleanup after all secondaries booted
- */
-static void __init loongson3_cpus_done(void)
-{
-}
-
 #ifdef CONFIG_HOTPLUG_CPU
 
 static int loongson3_cpu_disable(void)
@@ -432,7 +425,6 @@ struct plat_smp_ops loongson3_smp_ops = {
        .send_ipi_mask = loongson3_send_ipi_mask,
        .init_secondary = loongson3_init_secondary,
        .smp_finish = loongson3_smp_finish,
-       .cpus_done = loongson3_cpus_done,
        .boot_secondary = loongson3_boot_secondary,
        .smp_setup = loongson3_smp_setup,
        .prepare_cpus = loongson3_prepare_cpus,

diff --git a/arch/mips/netlogic/common/smp.c b/arch/mips/netlogic/common/smp.c
index 6baae15cc7b182e8840e71d58b7a8e3669385ca4..d81b443188af7fc502eb22b411621667c2c8f23d 100644 (file)
--- a/arch/mips/netlogic/common/smp.c
+++ b/arch/mips/netlogic/common/smp.c
@@ -135,10 +135,6 @@ void nlm_smp_finish(void)
        local_irq_enable();
 }
 
-void nlm_cpus_done(void)
-{
-}
-
 /*
  * Boot all other cpus in the system, initialize them, and bring them into
  * the boot function
@@ -277,7 +273,6 @@ struct plat_smp_ops nlm_smp_ops = {
        .send_ipi_mask          = nlm_send_ipi_mask,
        .init_secondary         = nlm_init_secondary,
        .smp_finish             = nlm_smp_finish,
-       .cpus_done              = nlm_cpus_done,
        .boot_secondary         = nlm_boot_secondary,
        .smp_setup              = nlm_smp_setup,
        .prepare_cpus           = nlm_prepare_cpus,

diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index f4ea8aa79ba2daaf341e2fec9be76a1d72aeedde..f9ae6a8fa7c726c8cab94797ce6a610d5397a0ab 100644 (file)
--- 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)
        local_irq_enable();
 }
 
-static void __init ip27_cpus_done(void)
-{
-}
-
 /*
  * Launch a slave into smp_bootstrap().         It doesn't take an argument, and we
  * 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 = {
        .send_ipi_mask          = ip27_send_ipi_mask,
        .init_secondary         = ip27_init_secondary,
        .smp_finish             = ip27_smp_finish,
-       .cpus_done              = ip27_cpus_done,
        .boot_secondary         = ip27_boot_secondary,
        .smp_setup              = ip27_smp_setup,
        .prepare_cpus           = ip27_prepare_cpus,

diff --git a/arch/mips/sibyte/bcm1480/smp.c b/arch/mips/sibyte/bcm1480/smp.c
index 70d9182b26f155703bbf7eb74a781a61681f2dc3..af7d44edd9a8f118b79944ecf21310634f308b56 100644 (file)
--- a/arch/mips/sibyte/bcm1480/smp.c
+++ b/arch/mips/sibyte/bcm1480/smp.c
@@ -114,13 +114,6 @@ static void bcm1480_smp_finish(void)
        local_irq_enable();
 }
 
-/*
- * Final cleanup after all secondaries booted
- */
-static void bcm1480_cpus_done(void)
-{
-}
-
 /*
  * Setup the PC, SP, and GP of a secondary processor and start it
  * running!
@@ -170,7 +163,6 @@ struct plat_smp_ops bcm1480_smp_ops = {
        .send_ipi_mask          = bcm1480_send_ipi_mask,
        .init_secondary         = bcm1480_init_secondary,
        .smp_finish             = bcm1480_smp_finish,
-       .cpus_done              = bcm1480_cpus_done,
        .boot_secondary         = bcm1480_boot_secondary,
        .smp_setup              = bcm1480_smp_setup,
        .prepare_cpus           = bcm1480_prepare_cpus,

diff --git a/arch/mips/sibyte/sb1250/smp.c b/arch/mips/sibyte/sb1250/smp.c
index db976117dd4d77948547b2f34a7a1b7ddde2a15b..c0c4b3f88a086f2c331cce0b311d9c547d3b5a6a 100644 (file)
--- a/arch/mips/sibyte/sb1250/smp.c
+++ b/arch/mips/sibyte/sb1250/smp.c
@@ -102,13 +102,6 @@ static void sb1250_smp_finish(void)
        local_irq_enable();
 }
 
-/*
- * Final cleanup after all secondaries booted
- */
-static void sb1250_cpus_done(void)
-{
-}
-
 /*
  * Setup the PC, SP, and GP of a secondary processor and start it
  * running!
@@ -158,7 +151,6 @@ struct plat_smp_ops sb_smp_ops = {
        .send_ipi_mask          = sb1250_send_ipi_mask,
        .init_secondary         = sb1250_init_secondary,
        .smp_finish             = sb1250_smp_finish,
-       .cpus_done              = sb1250_cpus_done,
        .boot_secondary         = sb1250_boot_secondary,
        .smp_setup              = sb1250_smp_setup,
        .prepare_cpus           = sb1250_prepare_cpus,