genirq: Move IRQ_WAKEUP to core

No users outside of core.

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

diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index 46889119e6a6381a649c69fc9e51db6116ff4958..cef0849dcfa5a8918336ad0453890566a194fad8 100644 (file)
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -49,6 +49,7 @@ enum {
  * IRQS_PENDING                        - irq is pending and replayed later
  * IRQS_MASKED                 - irq is masked
  * IRQS_SUSPENDED              - irq is suspended
+ * IRQS_WAKEUP                 - irq triggers system wakeup from suspend
  */
 enum {
        IRQS_AUTODETECT         = 0x00000001,
@@ -62,6 +63,7 @@ enum {
        IRQS_PENDING            = 0x00000200,
        IRQS_MASKED             = 0x00000400,
        IRQS_SUSPENDED          = 0x00000800,
+       IRQS_WAKEUP             = 0x00001000,
 };
 
 #define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data)

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index b912de4ff4de0138e334ebf1fb6500ddc076e8a2..ccc9389909ffea291a4a834a9c17af4a5cc3e1f1 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -489,7 +489,7 @@ int irq_set_irq_wake(unsigned int irq, unsigned int on)
                        if (ret)
                                desc->wake_depth = 0;
                        else
-                               desc->status |= IRQ_WAKEUP;
+                               desc->istate |= IRQS_WAKEUP;
                }
        } else {
                if (desc->wake_depth == 0) {
@@ -499,7 +499,7 @@ int irq_set_irq_wake(unsigned int irq, unsigned int on)
                        if (ret)
                                desc->wake_depth = 1;
                        else
-                               desc->status &= ~IRQ_WAKEUP;
+                               desc->istate &= ~IRQS_WAKEUP;
                }
        }
 

diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index d81337fc1cffb681176445d2774c9e7690711e1a..f39383d8672da086709acc8e377af2ca9d1746bc 100644 (file)
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -69,7 +69,7 @@ int check_wakeup_irqs(void)
        int irq;
 
        for_each_irq_desc(irq, desc)
-               if ((desc->status & IRQ_WAKEUP) &&
+               if ((desc->istate & IRQS_WAKEUP) &&
                    (desc->istate & IRQS_PENDING))
                        return -EBUSY;
 

diff --git a/kernel/irq/settings.h b/kernel/irq/settings.h
index 2cd45fd5ec8a33d5e41070af6b5e48a0b0b8e77b..ef09824e4b323b9c65f20aa246bea4c9ef17c788 100644 (file)
--- a/kernel/irq/settings.h
+++ b/kernel/irq/settings.h
@@ -18,3 +18,5 @@ enum {
 #define IRQ_PENDING            GOT_YOU_MORON
 #undef IRQ_MASKED
 #define IRQ_MASKED             GOT_YOU_MORON
+#undef IRQ_WAKEUP
+#define IRQ_WAKEUP             GOT_YOU_MORON