[PATCH 2/3] IRQ: Typedef the IRQ handler function type

David Howells
2006-10-02T16:20:58Z

From: David Howells <dhowells@redhat.com>

Typedef the IRQ handler function type.

Signed-Off-By: David Howells <dhowells@redhat.com>
---

include/linux/interrupt.h | 7 ++++---
kernel/irq/manage.c | 4 +---
2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 1f97e3d..1978235 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -64,8 +64,10 @@ #define SA_TRIGGER_FALLING IRQF_TRIGGER_
#define SA_TRIGGER_RISING IRQF_TRIGGER_RISING
#define SA_TRIGGER_MASK IRQF_TRIGGER_MASK

+typedef irqreturn_t (*irq_handler_t)(int, void *, struct pt_regs *);
+
struct irqaction {
- irqreturn_t (*handler)(int, void *, struct pt_regs *);
+ irq_handler_t handler;
unsigned long flags;
cpumask_t mask;
const char *name;
@@ -76,8 +78,7 @@ struct irqaction {
};

extern irqreturn_t no_action(int cpl, void *dev_id, struct pt_regs *regs);
-extern int request_irq(unsigned int,
- irqreturn_t (*handler)(int, void *, struct pt_regs *),
+extern int request_irq(unsigned int, irq_handler_t handler,
unsigned long, const char *, void *);
extern void free_irq(unsigned int, void *);

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 92be519..6879202 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -427,8 +427,7 @@ EXPORT_SYMBOL(free_irq);
* IRQF_SAMPLE_RANDOM The interrupt can be used for entropy
*
*/
-int request_irq(unsigned int irq,
- irqreturn_t (*handler)(int, void *, struct pt_regs *),
+int request_irq(unsigned int irq, irq_handler_t handler,
unsigned long irqflags, const char *devname, void *dev_id)
{
struct irqaction *action;
@@ -475,4 +474,3 @@ #endif
return retval;
}
EXPORT_SYMBOL(request_irq);
-