nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

genirq: make irqreturn_t an enum

Browse source 
Impact: cleanup

Remove the 2.4 compabiliy cruft

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Peter Zijlstra <peterz@infradead.org>
This commit is contained in:
Thomas Gleixner 2008-09-30 23:14:27 +02:00
parent c8e2aeef0b
commit bedd30d986
2 changed files with 12 additions and 20 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
include/linux/irq.h
View file

@ -280,7 +280,7 @@ static inline int irq_balancing_disabled(unsigned int irq)
} }
/* Handle irq action chains: */ /* 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, * 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: */ /* Handling of unhandled and spurious interrupts: */
extern void note_interrupt(unsigned int irq, struct irq_desc *desc, extern void note_interrupt(unsigned int irq, struct irq_desc *desc,
int action_ret); irqreturn_t action_ret);
/* Resending of interrupts :*/ /* Resending of interrupts :*/
void check_irq_resend(struct irq_desc *desc, unsigned int irq); void check_irq_resend(struct irq_desc *desc, unsigned int irq);

28
include/linux/irqreturn.h
View file

@ -1,25 +1,17 @@
/* irqreturn.h */
#ifndef _LINUX_IRQRETURN_H #ifndef _LINUX_IRQRETURN_H
#define _LINUX_IRQRETURN_H #define _LINUX_IRQRETURN_H
/* /**
* For 2.4.x compatibility, 2.4.x can use * enum irqreturn
* * @IRQ_NONE interrupt was not from this device
* typedef void irqreturn_t; * @IRQ_HANDLED interrupt was handled by this device
* #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)
*/ */
typedef int irqreturn_t; enum irqreturn {
IRQ_NONE,
IRQ_HANDLED,
};
#define IRQ_NONE (0) typedef enum irqreturn irqreturn_t;
#define IRQ_HANDLED (1) #define IRQ_RETVAL(x) ((x) != IRQ_NONE)
#define IRQ_RETVAL(x) ((x) != 0)
#endif #endif