Commit 7372eefc authored by Greg Ungerer's avatar Greg Ungerer

m68knommu: fix irq handler types in 68360/commproc.c

Compilation of arch/m68k/68360/commproc.c fails with the following errors:

arch/m68k/68360/commproc.c:75:1: error: function declaration isn’t a prototype
arch/m68k/68360/commproc.c:211:1: error: function declaration isn’t a prototype
arch/m68k/68360/commproc.c: In function ‘cpm_install_handler’:
arch/m68k/68360/commproc.c:214:2: warning: passing argument 2 of ‘request_irq’ from incompatible pointer type
include/linux/interrupt.h:128:1: note: expected ‘irq_handler_t’ but argument is of type ‘void (*)()’

It should be using the proper irq hander type, irq_handler_t. Modify it
to use that.
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent ef0012b4
...@@ -64,15 +64,15 @@ QUICC *pquicc; ...@@ -64,15 +64,15 @@ QUICC *pquicc;
/* CPM interrupt vector functions. */ /* CPM interrupt vector functions. */
struct cpm_action { struct cpm_action {
void (*handler)(void *); irq_handler_t handler;
void *dev_id; void *dev_id;
}; };
static struct cpm_action cpm_vecs[CPMVEC_NR]; static struct cpm_action cpm_vecs[CPMVEC_NR];
static void cpm_interrupt(int irq, void * dev, struct pt_regs * regs); static void cpm_interrupt(int irq, void * dev, struct pt_regs * regs);
static void cpm_error_interrupt(void *); static void cpm_error_interrupt(void *);
/* prototypes: */ /* prototypes: */
void cpm_install_handler(int vec, void (*handler)(), void *dev_id); void cpm_install_handler(int vec, irq_handler_t handler, void *dev_id);
void m360_cpm_reset(void); void m360_cpm_reset(void);
...@@ -208,7 +208,7 @@ cpm_error_interrupt(void *dev) ...@@ -208,7 +208,7 @@ cpm_error_interrupt(void *dev)
/* Install a CPM interrupt handler. /* Install a CPM interrupt handler.
*/ */
void void
cpm_install_handler(int vec, void (*handler)(), void *dev_id) cpm_install_handler(int vec, irq_handler_t handler, void *dev_id)
{ {
request_irq(vec, handler, 0, "timer", dev_id); request_irq(vec, handler, 0, "timer", dev_id);
......
...@@ -649,7 +649,7 @@ typedef struct scc_trans { ...@@ -649,7 +649,7 @@ typedef struct scc_trans {
/* #define CPMVEC_PIO_PC4 ((ushort)0x01) */ /* #define CPMVEC_PIO_PC4 ((ushort)0x01) */
/* #define CPMVEC_ERROR ((ushort)0x00) */ /* #define CPMVEC_ERROR ((ushort)0x00) */
extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id); extern void cpm_install_handler(int vec, irq_handler_t handler, void *dev_id);
/* CPM interrupt configuration vector. /* CPM interrupt configuration vector.
*/ */
......
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