diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-07 14:55:35 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:15 -0500 |
commit | 6954b75b488dd740950573f244ddd66fd28620aa (patch) | |
tree | 66a423d8d09c19d428e3e73373944a826f31f38e /kernel/irq/spurious.c | |
parent | 6f91a52d9bb28396177662f1da0f2e2cef9cf5d0 (diff) |
genirq: Move IRQ_POLL_INPROGRESS to core
No users outside of core.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/spurious.c')
-rw-r--r-- | kernel/irq/spurious.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index 2941d8a22df7..21c46178b1a6 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
@@ -98,13 +98,13 @@ static int try_one_irq(int irq, struct irq_desc *desc, bool force) | |||
98 | } | 98 | } |
99 | 99 | ||
100 | /* Mark it poll in progress */ | 100 | /* Mark it poll in progress */ |
101 | desc->status |= IRQ_POLL_INPROGRESS; | 101 | desc->istate |= IRQS_POLL_INPROGRESS; |
102 | do { | 102 | do { |
103 | if (handle_irq_event(desc) == IRQ_HANDLED) | 103 | if (handle_irq_event(desc) == IRQ_HANDLED) |
104 | ret = IRQ_HANDLED; | 104 | ret = IRQ_HANDLED; |
105 | action = desc->action; | 105 | action = desc->action; |
106 | } while ((desc->status & IRQ_PENDING) && action); | 106 | } while ((desc->status & IRQ_PENDING) && action); |
107 | desc->status &= ~IRQ_POLL_INPROGRESS; | 107 | desc->istate &= ~IRQS_POLL_INPROGRESS; |
108 | out: | 108 | out: |
109 | raw_spin_unlock(&desc->lock); | 109 | raw_spin_unlock(&desc->lock); |
110 | return ret == IRQ_HANDLED; | 110 | return ret == IRQ_HANDLED; |
@@ -259,7 +259,7 @@ try_misrouted_irq(unsigned int irq, struct irq_desc *desc, | |||
259 | void note_interrupt(unsigned int irq, struct irq_desc *desc, | 259 | void note_interrupt(unsigned int irq, struct irq_desc *desc, |
260 | irqreturn_t action_ret) | 260 | irqreturn_t action_ret) |
261 | { | 261 | { |
262 | if (desc->status & IRQ_POLL_INPROGRESS) | 262 | if (desc->istate & IRQS_POLL_INPROGRESS) |
263 | return; | 263 | return; |
264 | 264 | ||
265 | if (unlikely(action_ret != IRQ_HANDLED)) { | 265 | if (unlikely(action_ret != IRQ_HANDLED)) { |