Commit-ID: 0877d66257082ce86fca8f9826b91870575b272c
Gitweb: http://git.kernel.org/tip/0877d66257082ce86fca8f9826b91870575b272c
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Mon, 7 Feb 2011 01:29:15 +0100
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Sat, 19 Feb 2011 12:58:13 +0100
genirq: Use handle_irq_event() in the spurious poll code
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
kernel/irq/spurious.c | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 89e5e16..bc06207 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -56,13 +56,14 @@ bool irq_wait_for_poll(struct irq_desc *desc)
#endif
}
+
/*
* Recovery handler for misrouted interrupts.
*/
static int try_one_irq(int irq, struct irq_desc *desc, bool force)
{
+ irqreturn_t ret = IRQ_NONE;
struct irqaction *action;
- int ok = 0;
raw_spin_lock(&desc->lock);
@@ -96,21 +97,17 @@ static int try_one_irq(int irq, struct irq_desc *desc, bool force)
goto out;
}
- /* Honour the normal IRQ locking and mark it poll in progress */
- desc->status |= IRQ_INPROGRESS | IRQ_POLL_INPROGRESS;
+ /* Mark it poll in progress */
+ desc->status |= IRQ_POLL_INPROGRESS;
do {
- desc->status &= ~IRQ_PENDING;
- raw_spin_unlock(&desc->lock);
- if (handle_IRQ_event(irq, action) != IRQ_NONE)
- ok = 1;
- raw_spin_lock(&desc->lock);
+ if (handle_irq_event(desc) == IRQ_HANDLED)
+ ret = IRQ_HANDLED;
action = desc->action;
- } while ((desc->status & IRQ_PENDING) && action);
-
- desc->status &= ~(IRQ_INPROGRESS | IRQ_POLL_INPROGRESS);
+ } while ((desc->status & IRQ_PENDING) && action);
+ desc->status &= ~IRQ_POLL_INPROGRESS;
out:
raw_spin_unlock(&desc->lock);
- return ok;
+ return ret == IRQ_HANDLED;
}
static int misrouted_irq(int irq)
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|