Merge tag 'vfio-v3.17-rc1' of git://github.com/awilliam/linux-vfio

[cascardo/linux.git] / drivers / irqchip / irq-nvic.c

diff --git a/drivers/irqchip/irq-nvic.c b/drivers/irqchip/irq-nvic.c
index 70bdf6e..4ff0805 100644 (file)
--- 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)
        handle_IRQ(irq, regs);
 }
 
-static void nvic_eoi(struct irq_data *d)
-{
-       /*
-        * This is a no-op as end of interrupt is signaled by the exception
-        * return sequence.
-        */
-}
-
 static int __init nvic_of_init(struct device_node *node,
                               struct device_node *parent)
 {
@@ -102,7 +94,10 @@ static int __init nvic_of_init(struct device_node *node,
                gc->chip_types[0].regs.disable = NVIC_ICER;
                gc->chip_types[0].chip.irq_mask = irq_gc_mask_disable_reg;
                gc->chip_types[0].chip.irq_unmask = irq_gc_unmask_enable_reg;
-               gc->chip_types[0].chip.irq_eoi = nvic_eoi;
+               /* This is a no-op as end of interrupt is signaled by the
+                * exception return sequence.
+                */
+               gc->chip_types[0].chip.irq_eoi = irq_gc_noop;
 
                /* disable interrupts */
                writel_relaxed(~0, gc->reg_base + NVIC_ICER);