summaryrefslogtreecommitdiffstats
path: root/kernel/irq/manage.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-10 19:46:26 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-19 12:58:22 +0100
commit7f94226f03299f1ca32f118f02f2a0295e0e5e93 (patch)
tree049a83a3c264d4378f341991800c345bf4eeb5a5 /kernel/irq/manage.c
parentd4d5e08960844a062da8387ee5f16ca7a33200d0 (diff)
genirq: Move wakeup state to irq_data
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>
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r--kernel/irq/manage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 50809c79c7a..ea6add6036b 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -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);
}
}