Skip to content

Commit

Permalink
irqchip: spear_shirq: Remove the parent irq "ack"/unmask
Browse files Browse the repository at this point in the history
"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>
  • Loading branch information
Thomas Gleixner authored and Jason Cooper committed Jun 24, 2014
1 parent 25dc49e commit fe64ac8
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions drivers/irqchip/spear-shirq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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,
Expand Down

0 comments on commit fe64ac8

Please sign in to comment.