genirq: Move IRQ_POLL_INPROGRESS to core

No users outside of core.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 67b77cfb2a34a4734bb9d7fb65cfa58e88e0b1c8..047a695511dfa3d23c2ec53b80e6a03fbf32baa0 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -69,7 +69,6 @@ typedef       void (*irq_flow_handler_t)(unsigned int irq,
 #define IRQ_SUSPENDED          0x04000000      /* IRQ has gone through suspend sequence */
 #define IRQ_ONESHOT            0x08000000      /* IRQ is not unmasked after hardirq */
 #define IRQ_NESTED_THREAD      0x10000000      /* IRQ is nested into another, no own handler thread */
-#define IRQ_POLL_INPROGRESS    0x20000000      /* IRQ poll is in progress */
 
 #define IRQF_MODIFY_MASK       \
        (IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index bff21f233a0278cd9414773f83a6ea5aecb5c865..34245e7d12138bc72a8ad246cfa314642289300a 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -400,7 +400,7 @@ EXPORT_SYMBOL_GPL(handle_nested_irq);
 
 static bool irq_check_poll(struct irq_desc *desc)
 {
-       if (!(desc->status & IRQ_POLL_INPROGRESS))
+       if (!(desc->istate & IRQS_POLL_INPROGRESS))
                return false;
        return irq_wait_for_poll(desc);
 }

diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index dc5e21b84f9e305d61e03fb9154bdbd806f60953..f5d28e1e1eda1c02540579d6f21e382b2d6a4380 100644 (file)
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -39,10 +39,12 @@ enum {
  * IRQS_AUTODETECT             - autodetection in progress
  * IRQS_SPURIOUS_DISABLED      - was disabled due to spurious interrupt
  *                               detection
+ * IRQS_POLL_INPROGRESS                - polling in progress
  */
 enum {
        IRQS_AUTODETECT         = 0x00000001,
        IRQS_SPURIOUS_DISABLED  = 0x00000002,
+       IRQS_POLL_INPROGRESS    = 0x00000008,
 };
 
 #define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data)

diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 2941d8a22df7b15e00f814f5ab6e7336c371d207..21c46178b1a6a968ba66f233f706129737d7dcda 100644 (file)
--- 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)
        }
 
        /* Mark it poll in progress */
-       desc->status |= IRQ_POLL_INPROGRESS;
+       desc->istate |= IRQS_POLL_INPROGRESS;
        do {
                if (handle_irq_event(desc) == IRQ_HANDLED)
                        ret = IRQ_HANDLED;
                action = desc->action;
        } while ((desc->status & IRQ_PENDING) && action);
-       desc->status &= ~IRQ_POLL_INPROGRESS;
+       desc->istate &= ~IRQS_POLL_INPROGRESS;
 out:
        raw_spin_unlock(&desc->lock);
        return ret == IRQ_HANDLED;
@@ -259,7 +259,7 @@ try_misrouted_irq(unsigned int irq, struct irq_desc *desc,
 void note_interrupt(unsigned int irq, struct irq_desc *desc,
                    irqreturn_t action_ret)
 {
-       if (desc->status & IRQ_POLL_INPROGRESS)
+       if (desc->istate & IRQS_POLL_INPROGRESS)
                return;
 
        if (unlikely(action_ret != IRQ_HANDLED)) {