Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d2cd17f authored Feb 08, 2011 by Thomas Gleixner

genirq: Move IRQ_WAKEUP to core



No users outside of core.

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

parent c531e836

kernel/irq/internals.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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)

kernel/irq/manage.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}
	}		}

kernel/irq/pm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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;

kernel/irq/settings.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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