Commit-ID:  c76c15e6f16c1529b524ba2c519c4fcef7a45e16
Gitweb:     http://git.kernel.org/tip/c76c15e6f16c1529b524ba2c519c4fcef7a45e16
Author:     Arnd Bergmann <a...@arndb.de>
AuthorDate: Mon, 18 Jul 2016 18:03:21 +0200
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Tue, 19 Jul 2016 09:43:43 +0200

irqchip/armada: Avoid unused function warnings

When building with CONFIG_SMP disabled, we get some new harmless warnings:

 drivers/irqchip/irq-armada-370-xp.c:356:12: error: 
'mpic_cascaded_starting_cpu' defined but not used [-Werror=unused-function]
  static int mpic_cascaded_starting_cpu(unsigned int cpu)
            ^~~~~~~~~~~~~~~~~~~~~~~~~~
 drivers/irqchip/irq-armada-370-xp.c:349:12: error: 
'armada_xp_mpic_starting_cpu' defined but not used [-Werror=unused-function]
  static int armada_xp_mpic_starting_cpu(unsigned int cpu)

This moves the unused functions into the #ifdef, as they previously were.

Signed-off-by: Arnd Bergmann <a...@arndb.de>
Acked-by: Jason Cooper <ja...@lakedaemon.net>
Cc: David S. Miller <da...@davemloft.net>
Cc: Gregory CLEMENT <gregory.clem...@free-electrons.com>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Marc Zyngier <marc.zyng...@arm.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Richard Cochran <rcoch...@linutronix.de>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Thomas Petazzoni <thomas.petazz...@free-electrons.com>
Fixes: cb5ff2d245c1 ("irqchip/armada-370-xp: Convert to hotplug state machine")
Link: http://lkml.kernel.org/r/20160718160335.3134412-1-a...@arndb.de
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 drivers/irqchip/irq-armada-370-xp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-armada-370-xp.c 
b/drivers/irqchip/irq-armada-370-xp.c
index e2b8fee..cdef440 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -344,7 +344,6 @@ static void armada_mpic_send_doorbell(const struct cpumask 
*mask,
        writel((map << 8) | irq, main_int_base +
                ARMADA_370_XP_SW_TRIG_INT_OFFS);
 }
-#endif
 
 static int armada_xp_mpic_starting_cpu(unsigned int cpu)
 {
@@ -359,6 +358,7 @@ static int mpic_cascaded_starting_cpu(unsigned int cpu)
        enable_percpu_irq(parent_irq, IRQ_TYPE_NONE);
        return 0;
 }
+#endif
 
 static const struct irq_domain_ops armada_370_xp_mpic_irq_ops = {
        .map = armada_370_xp_mpic_irq_map,

Reply via email to