writeback: fixups for !dirty_writeback_centisecs

[safe/jmp/linux-2.6] / include / linux / irqreturn.h

diff --git a/include/linux/irqreturn.h b/include/linux/irqreturn.h
index 881883c..819acaa 100644 (file)
--- a/include/linux/irqreturn.h
+++ b/include/linux/irqreturn.h
@@ -1,25 +1,19 @@
-/* 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
+ * @IRQ_WAKE_THREAD    handler requests to wake the handler thread
  */
-typedef int irqreturn_t;
+enum irqreturn {
+       IRQ_NONE,
+       IRQ_HANDLED,
+       IRQ_WAKE_THREAD,
+};
 
-#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