Commit 8668fb5d authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds

[PATCH] m68knommu: use irq_handler_t and remove regs arg for 68328

Remove regs arg from bad interrupt handler.
Use irq_handler_t type for handler arg of local request_irq().
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1ea9acc7
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/interrupt.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -64,7 +65,7 @@ asmlinkage void trap44(void); ...@@ -64,7 +65,7 @@ asmlinkage void trap44(void);
asmlinkage void trap45(void); asmlinkage void trap45(void);
asmlinkage void trap46(void); asmlinkage void trap46(void);
asmlinkage void trap47(void); asmlinkage void trap47(void);
asmlinkage irqreturn_t bad_interrupt(int, void *, struct pt_regs *); asmlinkage irqreturn_t bad_interrupt(int, void *);
asmlinkage irqreturn_t inthandler(void); asmlinkage irqreturn_t inthandler(void);
asmlinkage irqreturn_t inthandler1(void); asmlinkage irqreturn_t inthandler1(void);
asmlinkage irqreturn_t inthandler2(void); asmlinkage irqreturn_t inthandler2(void);
...@@ -121,7 +122,7 @@ void init_IRQ(void) ...@@ -121,7 +122,7 @@ void init_IRQ(void)
int request_irq( int request_irq(
unsigned int irq, unsigned int irq,
irqreturn_t (*handler)(int, void *, struct pt_regs *), irq_handler_t handler,
unsigned long flags, unsigned long flags,
const char *devname, const char *devname,
void *dev_id) void *dev_id)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment