Skip to content

Commit

Permalink
[PATCH] m68knommu: use irq_handler_t and remove regs arg for 68328
Browse files Browse the repository at this point in the history
Remove regs arg from bad interrupt handler.
Use irq_handler_t type for handler arg of local request_irq().

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Greg Ungerer authored and Linus Torvalds committed Mar 7, 2007
1 parent 1ea9acc commit 8668fb5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/m68knommu/platform/68328/ints.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/kernel_stat.h>
#include <linux/errno.h>
#include <linux/interrupt.h>

#include <asm/system.h>
#include <asm/irq.h>
Expand Down Expand Up @@ -64,7 +65,7 @@ asmlinkage void trap44(void);
asmlinkage void trap45(void);
asmlinkage void trap46(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 inthandler1(void);
asmlinkage irqreturn_t inthandler2(void);
Expand Down Expand Up @@ -121,7 +122,7 @@ void init_IRQ(void)

int request_irq(
unsigned int irq,
irqreturn_t (*handler)(int, void *, struct pt_regs *),
irq_handler_t handler,
unsigned long flags,
const char *devname,
void *dev_id)
Expand Down

0 comments on commit 8668fb5

Please sign in to comment.