genirq: Use handle_irq_event() in handle_level_irq()

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2011-02-07 01:22:17 +01:00
parent 107781e721
commit 1529866c63

View File

@ -479,9 +479,6 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc)
void void
handle_level_irq(unsigned int irq, struct irq_desc *desc) handle_level_irq(unsigned int irq, struct irq_desc *desc)
{ {
struct irqaction *action;
irqreturn_t action_ret;
raw_spin_lock(&desc->lock); raw_spin_lock(&desc->lock);
mask_ack_irq(desc); mask_ack_irq(desc);
@ -496,19 +493,10 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
* If its disabled or no action available * If its disabled or no action available
* keep it masked and get out of here * keep it masked and get out of here
*/ */
action = desc->action; if (unlikely(!desc->action || (desc->status & IRQ_DISABLED)))
if (unlikely(!action || (desc->status & IRQ_DISABLED)))
goto out_unlock; goto out_unlock;
desc->status |= IRQ_INPROGRESS; 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);
desc->status &= ~IRQ_INPROGRESS;
if (!(desc->status & (IRQ_DISABLED | IRQ_ONESHOT))) if (!(desc->status & (IRQ_DISABLED | IRQ_ONESHOT)))
unmask_irq(desc); unmask_irq(desc);