genirq: Move wakeup state to irq_data
Thomas Gleixner [Thu, 10 Feb 2011 18:46:26 +0000 (19:46 +0100)]
Some irq_chips need to know the state of wakeup mode for
setting the trigger type etc. Reflect it in irq_data state.

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

include/linux/irq.h
kernel/irq/internals.h
kernel/irq/manage.c
kernel/irq/pm.c

index ef6b66d..94c8f5b 100644 (file)
@@ -168,6 +168,8 @@ struct irq_data {
  * IRQD_PER_CPU                        - Interrupt is per cpu
  * IRQD_AFFINITY_SET           - Interrupt affinity was set
  * IRQD_LEVEL                  - Interrupt is level triggered
+ * IRQD_WAKEUP_STATE           - Interrupt is configured for wakeup
+ *                               from suspend
  */
 enum {
        IRQD_TRIGGER_MASK               = 0xf,
@@ -176,6 +178,7 @@ enum {
        IRQD_PER_CPU                    = (1 << 11),
        IRQD_AFFINITY_SET               = (1 << 12),
        IRQD_LEVEL                      = (1 << 13),
+       IRQD_WAKEUP_STATE               = (1 << 14),
 };
 
 static inline bool irqd_is_setaffinity_pending(struct irq_data *d)
@@ -217,6 +220,11 @@ static inline bool irqd_is_level_type(struct irq_data *d)
        return d->state_use_accessors & IRQD_LEVEL;
 }
 
+static inline bool irqd_is_wakeup_set(struct irq_data *d)
+{
+       return d->state_use_accessors & IRQD_WAKEUP_STATE;
+}
+
 /**
  * struct irq_chip - hardware interrupt chip descriptor
  *
index 1d500fb..5e2366d 100644 (file)
@@ -46,7 +46,6 @@ 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,
@@ -60,7 +59,6 @@ enum {
        IRQS_PENDING            = 0x00000200,
        IRQS_MASKED             = 0x00000400,
        IRQS_SUSPENDED          = 0x00000800,
-       IRQS_WAKEUP             = 0x00001000,
 };
 
 #include "compat.h"
index 50809c7..ea6add6 100644 (file)
@@ -492,7 +492,7 @@ int irq_set_irq_wake(unsigned int irq, unsigned int on)
                        if (ret)
                                desc->wake_depth = 0;
                        else
-                               desc->istate |= IRQS_WAKEUP;
+                               irqd_set(&desc->irq_data, IRQD_WAKEUP_STATE);
                }
        } else {
                if (desc->wake_depth == 0) {
@@ -502,7 +502,7 @@ int irq_set_irq_wake(unsigned int irq, unsigned int on)
                        if (ret)
                                desc->wake_depth = 1;
                        else
-                               desc->istate &= ~IRQS_WAKEUP;
+                               irqd_clear(&desc->irq_data, IRQD_WAKEUP_STATE);
                }
        }
 
index f39383d..1329f0e 100644 (file)
@@ -69,7 +69,7 @@ int check_wakeup_irqs(void)
        int irq;
 
        for_each_irq_desc(irq, desc)
-               if ((desc->istate & IRQS_WAKEUP) &&
+               if (irqd_is_wakeup_set(&desc->irq_data) &&
                    (desc->istate & IRQS_PENDING))
                        return -EBUSY;