diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-10 13:46:26 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:22 -0500 |
commit | 7f94226f03299f1ca32f118f02f2a0295e0e5e93 (patch) | |
tree | 049a83a3c264d4378f341991800c345bf4eeb5a5 /kernel/irq/manage.c | |
parent | d4d5e08960844a062da8387ee5f16ca7a33200d0 (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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 50809c79c7ad..ea6add6036b1 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) | |||
492 | if (ret) | 492 | if (ret) |
493 | desc->wake_depth = 0; | 493 | desc->wake_depth = 0; |
494 | else | 494 | else |
495 | desc->istate |= IRQS_WAKEUP; | 495 | irqd_set(&desc->irq_data, IRQD_WAKEUP_STATE); |
496 | } | 496 | } |
497 | } else { | 497 | } else { |
498 | if (desc->wake_depth == 0) { | 498 | if (desc->wake_depth == 0) { |
@@ -502,7 +502,7 @@ int irq_set_irq_wake(unsigned int irq, unsigned int on) | |||
502 | if (ret) | 502 | if (ret) |
503 | desc->wake_depth = 1; | 503 | desc->wake_depth = 1; |
504 | else | 504 | else |
505 | desc->istate &= ~IRQS_WAKEUP; | 505 | irqd_clear(&desc->irq_data, IRQD_WAKEUP_STATE); |
506 | } | 506 | } |
507 | } | 507 | } |
508 | 508 | ||