diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-06-19 17:34:43 -0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-06-24 08:38:27 -0400 |
| commit | fe64ac89cf8f5067cf7f6757b6cd9fd77c527bdf (patch) | |
| tree | 66f22e62e6326002043f89df875168ee99dedd20 | |
| parent | 25dc49e3321a3b3f17b3f78297432073bb14ec0b (diff) | |
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>
| -rw-r--r-- | drivers/irqchip/spear-shirq.c | 6 |
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 = { | |||
| 222 | static void shirq_handler(unsigned irq, struct irq_desc *desc) | 222 | static void shirq_handler(unsigned irq, struct irq_desc *desc) |
| 223 | { | 223 | { |
| 224 | struct spear_shirq *shirq = irq_get_handler_data(irq); | 224 | struct spear_shirq *shirq = irq_get_handler_data(irq); |
| 225 | struct irq_data *idata = irq_desc_get_irq_data(desc); | ||
| 226 | struct irq_chip *chip = irq_data_get_irq_chip(idata); | ||
| 227 | u32 pend; | 225 | u32 pend; |
| 228 | 226 | ||
| 229 | chip->irq_ack(idata); | ||
| 230 | |||
| 231 | pend = readl(shirq->base + shirq->regs.status_reg) & shirq->mask; | 227 | pend = readl(shirq->base + shirq->regs.status_reg) & shirq->mask; |
| 232 | pend >>= shirq->offset; | 228 | pend >>= shirq->offset; |
| 233 | 229 | ||
| @@ -237,8 +233,6 @@ static void shirq_handler(unsigned irq, struct irq_desc *desc) | |||
| 237 | pend &= ~(0x1 << irq); | 233 | pend &= ~(0x1 << irq); |
| 238 | generic_handle_irq(shirq->virq_base + irq); | 234 | generic_handle_irq(shirq->virq_base + irq); |
| 239 | } | 235 | } |
| 240 | |||
| 241 | chip->irq_unmask(idata); | ||
| 242 | } | 236 | } |
| 243 | 237 | ||
| 244 | static void __init spear_shirq_register(struct spear_shirq *shirq, | 238 | static void __init spear_shirq_register(struct spear_shirq *shirq, |
