[PATCH] m68knommu: fix up for the irq_handler_t changes

Switch to using irq_handler_t for interrupt function handler pointers.

Change name of m68knommu's irq_hanlder_t data structure so it doesn't
clash with the common type (include/linux/interrupt.h).

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Greg Ungerer 2006-11-20 15:46:22 +10:00 • committed by Linus Torvalds
commit ace5f1d425
6 changed files with 16 additions and 16 deletions

View file

@ -0,0 +1 @@
#include <asm-generic/irq_regs.h>

View file

@ -8,7 +8,7 @@
* interrupt source (if it supports chaining).
*/
typedef struct irq_node {
irqreturn_t (*handler)(int, void *, struct pt_regs *);
irq_handler_t handler;
unsigned long flags;
void *dev_id;
const char *devname;
@ -18,12 +18,12 @@ typedef struct irq_node {
/*
* This structure has only 4 elements for speed reasons
*/
typedef struct irq_handler {
irqreturn_t (*handler)(int, void *, struct pt_regs *);
struct irq_entry {
irq_handler_t handler;
unsigned long flags;
void *dev_id;
const char *devname;
} irq_handler_t;
};
/* count of spurious interrupts */
extern volatile unsigned int num_spurious;

View file

@ -18,7 +18,7 @@ extern int (*mach_kbdrate) (struct kbd_repeat *);
extern void (*mach_kbd_leds) (unsigned int);
/* machine dependent irq functions */
extern void (*mach_init_IRQ) (void);
extern irqreturn_t (*(*mach_default_handler)[]) (int, void *, struct pt_regs *);
extern irq_handler_t mach_default_handler;
extern int (*mach_request_irq) (unsigned int irq, void (*handler)(int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id);
extern void (*mach_free_irq) (unsigned int irq, void *dev_id);