From 65e269e742fee8315123c38643b9320a83321637 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 30 Sep 2008 23:14:27 +0200
Subject: [PATCH] --- yaml --- r: 135793 b: refs/heads/master c:
 bedd30d986a05e32dc3eab874e4b9ed8a38058bb h: refs/heads/master i:   135791:
 0c7223d95314fd16c38061df7595eec9df31dfcc v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/irq.h       |  4 ++--
 trunk/include/linux/irqreturn.h | 28 ++++++++++------------------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 09a3897da0ab..fa1d8e205f10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8e2aeef0b8ac9fb8821b8b3734c031579d0b77a
+refs/heads/master: bedd30d986a05e32dc3eab874e4b9ed8a38058bb
diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
index 7c07a09931db..19770923bcb0 100644
--- a/trunk/include/linux/irq.h
+++ b/trunk/include/linux/irq.h
@@ -280,7 +280,7 @@ static inline int irq_balancing_disabled(unsigned int irq)
 }
 
 /* Handle irq action chains: */
-extern int handle_IRQ_event(unsigned int irq, struct irqaction *action);
+extern irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action);
 
 /*
  * Built-in IRQ handlers for various IRQ types,
@@ -325,7 +325,7 @@ static inline void generic_handle_irq(unsigned int irq)
 
 /* Handling of unhandled and spurious interrupts: */
 extern void note_interrupt(unsigned int irq, struct irq_desc *desc,
-			   int action_ret);
+			   irqreturn_t action_ret);
 
 /* Resending of interrupts :*/
 void check_irq_resend(struct irq_desc *desc, unsigned int irq);
diff --git a/trunk/include/linux/irqreturn.h b/trunk/include/linux/irqreturn.h
index 881883c2009d..c5584ca5b8c9 100644
--- a/trunk/include/linux/irqreturn.h
+++ b/trunk/include/linux/irqreturn.h
@@ -1,25 +1,17 @@
-/* irqreturn.h */
 #ifndef _LINUX_IRQRETURN_H
 #define _LINUX_IRQRETURN_H
 
-/*
- * For 2.4.x compatibility, 2.4.x can use
- *
- *	typedef void irqreturn_t;
- *	#define IRQ_NONE
- *	#define IRQ_HANDLED
- *	#define IRQ_RETVAL(x)
- *
- * To mix old-style and new-style irq handler returns.
- *
- * IRQ_NONE means we didn't handle it.
- * IRQ_HANDLED means that we did have a valid interrupt and handled it.
- * IRQ_RETVAL(x) selects on the two depending on x being non-zero (for handled)
+/**
+ * enum irqreturn
+ * @IRQ_NONE		interrupt was not from this device
+ * @IRQ_HANDLED		interrupt was handled by this device
  */
-typedef int irqreturn_t;
+enum irqreturn {
+	IRQ_NONE,
+	IRQ_HANDLED,
+};
 
-#define IRQ_NONE	(0)
-#define IRQ_HANDLED	(1)
-#define IRQ_RETVAL(x)	((x) != 0)
+typedef enum irqreturn irqreturn_t;
+#define IRQ_RETVAL(x)	((x) != IRQ_NONE)
 
 #endif