Commit-ID: c76c15e6f16c1529b524ba2c519c4fcef7a45e16
Gitweb: http://git.kernel.org/tip/c76c15e6f16c1529b524ba2c519c4fcef7a45e16
Author: Arnd Bergmann <[email protected]>
AuthorDate: Mon, 18 Jul 2016 18:03:21 +0200
Committer: Ingo Molnar <[email protected]>
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 <[email protected]>
Acked-by: Jason Cooper <[email protected]>
Cc: David S. Miller <[email protected]>
Cc: Gregory CLEMENT <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Marc Zyngier <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Richard Cochran <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Thomas Petazzoni <[email protected]>
Fixes: cb5ff2d245c1 ("irqchip/armada-370-xp: Convert to hotplug state machine")
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
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,
