A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

genirq: Move wakeup state to irq_data

Browse source 
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 <[email protected]>
This commit is contained in:
Thomas Gleixner 2011-02-10 19:46:26 +01:00
commit 7f94226f03
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/irq/internals.h
View 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"

4
kernel/irq/manage.c
View 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);
}
}

2
kernel/irq/pm.c
View 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;