aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Thompson <daniel.thompson@linaro.org>2014-06-04 11:01:52 -0400
committerJason Cooper <jason@lakedaemon.net>2014-06-20 22:12:42 -0400
commit8b53ec260e601d4b433e2e64863ee8e56ff8e312 (patch)
tree6ae4a27ef3cd5fdad76d9f0fa92e1a7ced6ce76f
parent7171511eaec5bf23fb06078f59784a3a0626b38f (diff)
irqchip: nvic: Use the generic noop function
Using the generic function saves looking up this custom one in a source navigator. Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org> Link: https://lkml.kernel.org/r/1401894112-13386-1-git-send-email-daniel.thompson@linaro.org Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--drivers/irqchip/irq-nvic.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/irqchip/irq-nvic.c b/drivers/irqchip/irq-nvic.c
index 70bdf6edb7bb..4ff0805fca01 100644
--- a/drivers/irqchip/irq-nvic.c
+++ b/drivers/irqchip/irq-nvic.c
@@ -49,14 +49,6 @@ nvic_handle_irq(irq_hw_number_t hwirq, struct pt_regs *regs)
49 handle_IRQ(irq, regs); 49 handle_IRQ(irq, regs);
50} 50}
51 51
52static void nvic_eoi(struct irq_data *d)
53{
54 /*
55 * This is a no-op as end of interrupt is signaled by the exception
56 * return sequence.
57 */
58}
59
60static int __init nvic_of_init(struct device_node *node, 52static int __init nvic_of_init(struct device_node *node,
61 struct device_node *parent) 53 struct device_node *parent)
62{ 54{
@@ -102,7 +94,10 @@ static int __init nvic_of_init(struct device_node *node,
102 gc->chip_types[0].regs.disable = NVIC_ICER; 94 gc->chip_types[0].regs.disable = NVIC_ICER;
103 gc->chip_types[0].chip.irq_mask = irq_gc_mask_disable_reg; 95 gc->chip_types[0].chip.irq_mask = irq_gc_mask_disable_reg;
104 gc->chip_types[0].chip.irq_unmask = irq_gc_unmask_enable_reg; 96 gc->chip_types[0].chip.irq_unmask = irq_gc_unmask_enable_reg;
105 gc->chip_types[0].chip.irq_eoi = nvic_eoi; 97 /* This is a no-op as end of interrupt is signaled by the
98 * exception return sequence.
99 */
100 gc->chip_types[0].chip.irq_eoi = irq_gc_noop;
106 101
107 /* disable interrupts */ 102 /* disable interrupts */
108 writel_relaxed(~0, gc->reg_base + NVIC_ICER); 103 writel_relaxed(~0, gc->reg_base + NVIC_ICER);