diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-07 01:23:07 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 12:58:12 +0100 |
| commit | a7ae4de5c8ae8110556f0f9c7241093ef984605c (patch) | |
| tree | 091189ede3ce3f56c0ba460a038010174c0ee03e /kernel | |
| parent | 1529866c63d789925de9b4250646d82d033e4b95 (diff) | |
| download | linux-stable-a7ae4de5c8ae8110556f0f9c7241093ef984605c.tar.gz linux-stable-a7ae4de5c8ae8110556f0f9c7241093ef984605c.tar.bz2 linux-stable-a7ae4de5c8ae8110556f0f9c7241093ef984605c.zip | |
genirq: Use handle_irq_event() in handle_fasteoi_irq()
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/chip.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 2d2ba4ace0ec..a499ca5b11aa 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -518,9 +518,6 @@ EXPORT_SYMBOL_GPL(handle_level_irq); void handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc) { - struct irqaction *action; - irqreturn_t action_ret; - raw_spin_lock(&desc->lock); if (unlikely(desc->status & IRQ_INPROGRESS)) @@ -534,26 +531,14 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc) * If its disabled or no action available * then mask it and get out of here: */ - action = desc->action; - if (unlikely(!action || (desc->status & IRQ_DISABLED))) { + if (unlikely(!desc->action || (desc->status & IRQ_DISABLED))) { desc->status |= IRQ_PENDING; mask_irq(desc); goto out; } - - desc->status |= IRQ_INPROGRESS; - 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); - desc->status &= ~IRQ_INPROGRESS; + handle_irq_event(desc); out: desc->irq_data.chip->irq_eoi(&desc->irq_data); - raw_spin_unlock(&desc->lock); } |