aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/irqchip/spear-shirq.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-06-19 21:34:43 +0000
committerJason Cooper <jason@lakedaemon.net>2014-06-24 12:38:27 +0000
commitfe64ac89cf8f5067cf7f6757b6cd9fd77c527bdf (patch)
tree66f22e62e6326002043f89df875168ee99dedd20 /drivers/irqchip/spear-shirq.c
parentirqchip: spear_shirq: Simplify chained handler (diff)
downloadlinux-dev-fe64ac89cf8f5067cf7f6757b6cd9fd77c527bdf.tar.xz
linux-dev-fe64ac89cf8f5067cf7f6757b6cd9fd77c527bdf.zip
irqchip: spear_shirq: Remove the parent irq "ack"/unmask
"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>
Diffstat (limited to 'drivers/irqchip/spear-shirq.c')
-rw-r--r--drivers/irqchip/spear-shirq.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/irqchip/spear-shirq.c b/drivers/irqchip/spear-shirq.c
index 8521a7295b02..8765aa7f7a15 100644
--- a/drivers/irqchip/spear-shirq.c
+++ b/drivers/irqchip/spear-shirq.c
@@ -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,