lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

genirq: Move IRQ_WAKEUP to core

Browse Source 
No users outside of core.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2011-02-08 14:34:18 +01:00
parent c531e8361f
commit 6d2cd17fde
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/irq/internals.h
View File

@@ -49,6 +49,7 @@ enum {
* IRQS_PENDING - irq is pending and replayed later * IRQS_PENDING - irq is pending and replayed later
* IRQS_MASKED - irq is masked * IRQS_MASKED - irq is masked
* IRQS_SUSPENDED - irq is suspended * IRQS_SUSPENDED - irq is suspended
* IRQS_WAKEUP - irq triggers system wakeup from suspend
*/ */
enum { enum {
IRQS_AUTODETECT = 0x00000001, IRQS_AUTODETECT = 0x00000001,
@@ -62,6 +63,7 @@ enum {
IRQS_PENDING = 0x00000200, IRQS_PENDING = 0x00000200,
IRQS_MASKED = 0x00000400, IRQS_MASKED = 0x00000400,
IRQS_SUSPENDED = 0x00000800, IRQS_SUSPENDED = 0x00000800,
IRQS_WAKEUP = 0x00001000,
}; };
#define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data) #define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data)

4
kernel/irq/manage.c
View File

@@ -489,7 +489,7 @@ int irq_set_irq_wake(unsigned int irq, unsigned int on)
if (ret) if (ret)
desc->wake_depth = 0; desc->wake_depth = 0;
else else
desc->status |= IRQ_WAKEUP; desc->istate |= IRQS_WAKEUP;
} }
} else { } else {
if (desc->wake_depth == 0) { if (desc->wake_depth == 0) {
@@ -499,7 +499,7 @@ int irq_set_irq_wake(unsigned int irq, unsigned int on)
if (ret) if (ret)
desc->wake_depth = 1; desc->wake_depth = 1;
else else
desc->status &= ~IRQ_WAKEUP; desc->istate &= ~IRQS_WAKEUP;
} }
} }

2
kernel/irq/pm.c
View File

@@ -69,7 +69,7 @@ int check_wakeup_irqs(void)
int irq; int irq;
for_each_irq_desc(irq, desc) for_each_irq_desc(irq, desc)
if ((desc->status & IRQ_WAKEUP) && if ((desc->istate & IRQS_WAKEUP) &&
(desc->istate & IRQS_PENDING)) (desc->istate & IRQS_PENDING))
return -EBUSY; return -EBUSY;

2
kernel/irq/settings.h
View File

@@ -18,3 +18,5 @@ enum {
#define IRQ_PENDING GOT_YOU_MORON #define IRQ_PENDING GOT_YOU_MORON
#undef IRQ_MASKED #undef IRQ_MASKED
#define IRQ_MASKED GOT_YOU_MORON #define IRQ_MASKED GOT_YOU_MORON
#undef IRQ_WAKEUP
#define IRQ_WAKEUP GOT_YOU_MORON