]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
irqchip: spear_shirq: Remove the parent irq "ack"/unmask
authorThomas Gleixner <tglx@linutronix.de>
Thu, 19 Jun 2014 21:34:43 +0000 (21:34 +0000)
committerJason Cooper <jason@lakedaemon.net>
Tue, 24 Jun 2014 12:38:27 +0000 (12:38 +0000)
"ack" is actually a mask in the parent irq. The demultiplexer and the
handlers run with interrupts disabled. No point in masking and
unmasking the parent.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20140619212713.754300980@linutronix.de
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
drivers/irqchip/spear-shirq.c

index 8521a7295b0209c79d8e1ff6ed8d737f84462cd1..8765aa7f7a15ce076e669fe5facf3062d0cccabe 100644 (file)
@@ -222,12 +222,8 @@ static struct irq_chip shirq_chip = {
 static void shirq_handler(unsigned irq, struct irq_desc *desc)
 {
        struct spear_shirq *shirq = irq_get_handler_data(irq);
-       struct irq_data *idata = irq_desc_get_irq_data(desc);
-       struct irq_chip *chip = irq_data_get_irq_chip(idata);
        u32 pend;
 
-       chip->irq_ack(idata);
-
        pend = readl(shirq->base + shirq->regs.status_reg) & shirq->mask;
        pend >>= shirq->offset;
 
@@ -237,8 +233,6 @@ static void shirq_handler(unsigned irq, struct irq_desc *desc)
                pend &= ~(0x1 << irq);
                generic_handle_irq(shirq->virq_base + irq);
        }
-
-       chip->irq_unmask(idata);
 }
 
 static void __init spear_shirq_register(struct spear_shirq *shirq,