diff options
-rw-r--r-- | include/linux/interrupt.h | 7 | ||||
-rw-r--r-- | 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 1f97e3d92639..19782350dcc8 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h | |||
@@ -64,8 +64,10 @@ | |||
64 | #define SA_TRIGGER_RISING IRQF_TRIGGER_RISING | 64 | #define SA_TRIGGER_RISING IRQF_TRIGGER_RISING |
65 | #define SA_TRIGGER_MASK IRQF_TRIGGER_MASK | 65 | #define SA_TRIGGER_MASK IRQF_TRIGGER_MASK |
66 | 66 | ||
67 | typedef irqreturn_t (*irq_handler_t)(int, void *, struct pt_regs *); | ||
68 | |||
67 | struct irqaction { | 69 | struct irqaction { |
68 | irqreturn_t (*handler)(int, void *, struct pt_regs *); | 70 | irq_handler_t handler; |
69 | unsigned long flags; | 71 | unsigned long flags; |
70 | cpumask_t mask; | 72 | cpumask_t mask; |
71 | const char *name; | 73 | const char *name; |
@@ -76,8 +78,7 @@ struct irqaction { | |||
76 | }; | 78 | }; |
77 | 79 | ||
78 | extern irqreturn_t no_action(int cpl, void *dev_id, struct pt_regs *regs); | 80 | extern irqreturn_t no_action(int cpl, void *dev_id, struct pt_regs *regs); |
79 | extern int request_irq(unsigned int, | 81 | extern int request_irq(unsigned int, irq_handler_t handler, |
80 | irqreturn_t (*handler)(int, void *, struct pt_regs *), | ||
81 | unsigned long, const char *, void *); | 82 | unsigned long, const char *, void *); |
82 | extern void free_irq(unsigned int, void *); | 83 | extern void free_irq(unsigned int, void *); |
83 | 84 | ||
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 92be519eff26..6879202afe9a 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -427,8 +427,7 @@ EXPORT_SYMBOL(free_irq); | |||
427 | * IRQF_SAMPLE_RANDOM The interrupt can be used for entropy | 427 | * IRQF_SAMPLE_RANDOM The interrupt can be used for entropy |
428 | * | 428 | * |
429 | */ | 429 | */ |
430 | int request_irq(unsigned int irq, | 430 | int request_irq(unsigned int irq, irq_handler_t handler, |
431 | irqreturn_t (*handler)(int, void *, struct pt_regs *), | ||
432 | unsigned long irqflags, const char *devname, void *dev_id) | 431 | unsigned long irqflags, const char *devname, void *dev_id) |
433 | { | 432 | { |
434 | struct irqaction *action; | 433 | struct irqaction *action; |
@@ -475,4 +474,3 @@ int request_irq(unsigned int irq, | |||
475 | return retval; | 474 | return retval; |
476 | } | 475 | } |
477 | EXPORT_SYMBOL(request_irq); | 476 | EXPORT_SYMBOL(request_irq); |
478 | |||