Commit a60a5dc2 authored by Thomas Gleixner's avatar Thomas Gleixner

genirq: Use handle_irq_event() in handle_edge_irq()

It's safe to drop the IRQ_INPROGRESS flag between action chain walks
as we are protected by desc->lock.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a7ae4de5
...@@ -583,14 +583,8 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc) ...@@ -583,14 +583,8 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
/* Start handling the irq */ /* Start handling the irq */
desc->irq_data.chip->irq_ack(&desc->irq_data); desc->irq_data.chip->irq_ack(&desc->irq_data);
/* Mark the IRQ currently in progress.*/
desc->status |= IRQ_INPROGRESS;
do { do {
struct irqaction *action = desc->action; if (unlikely(!desc->action)) {
irqreturn_t action_ret;
if (unlikely(!action)) {
mask_irq(desc); mask_irq(desc);
goto out_unlock; goto out_unlock;
} }
...@@ -606,16 +600,10 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc) ...@@ -606,16 +600,10 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
unmask_irq(desc); unmask_irq(desc);
} }
desc->status &= ~IRQ_PENDING; handle_irq_event(desc);
raw_spin_unlock(&desc->lock);
action_ret = handle_IRQ_event(irq, action);
if (!noirqdebug)
note_interrupt(irq, desc, action_ret);
raw_spin_lock(&desc->lock);
} while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING); } while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
desc->status &= ~IRQ_INPROGRESS;
out_unlock: out_unlock:
raw_spin_unlock(&desc->lock); raw_spin_unlock(&desc->lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment