Skip to content

Commit

Permalink
IRQ: Typedef the IRQ handler function type
Browse files Browse the repository at this point in the history
Typedef the IRQ handler function type.

Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1356d1e5fd256997e3d3dce0777ab787d0515c7a commit)
  • Loading branch information
dhowells authored and David Howells committed Oct 5, 2006
1 parent 57a58a9 commit da48279
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 4 additions & 3 deletions include/linux/interrupt.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,10 @@
#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;
Expand All @@ -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 *);

Expand Down
4 changes: 1 addition & 3 deletions kernel/irq/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -475,4 +474,3 @@ int request_irq(unsigned int irq,
return retval;
}
EXPORT_SYMBOL(request_irq);

0 comments on commit da48279

Please sign in to comment.