Skip to content

Commit

Permalink
genirq: Use handle_irq_event() in handle_edge_irq()
Browse files Browse the repository at this point in the history
It's safe to drop the IRQ_INPROGRESS flag between action chain walks
as we are protected by desc->lock.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Thomas Gleixner committed Feb 19, 2011
1 parent a7ae4de commit a60a5dc
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions kernel/irq/chip.c
Original file line number Diff line number Diff line change
Expand Up @@ -583,14 +583,8 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
/* Start handling the irq */
desc->irq_data.chip->irq_ack(&desc->irq_data);

/* Mark the IRQ currently in progress.*/
desc->status |= IRQ_INPROGRESS;

do {
struct irqaction *action = desc->action;
irqreturn_t action_ret;

if (unlikely(!action)) {
if (unlikely(!desc->action)) {
mask_irq(desc);
goto out_unlock;
}
Expand All @@ -606,16 +600,10 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
unmask_irq(desc);
}

desc->status &= ~IRQ_PENDING;
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);
handle_irq_event(desc);

} while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);

desc->status &= ~IRQ_INPROGRESS;
out_unlock:
raw_spin_unlock(&desc->lock);
}
Expand Down

0 comments on commit a60a5dc

Please sign in to comment.