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: Greg Ungerer <gerg@uclinux.org>

diff --git a/arch/m68k/68360/commproc.c b/arch/m68k/68360/commproc.c
index 315727b7ff40f4170cc05e5d432bd4542dd1102f..14d7f35cd37b4c3cc2a0db905213fe1077cbdf95 100644 (file)
--- a/arch/m68k/68360/commproc.c
+++ b/arch/m68k/68360/commproc.c
@@ -64,15 +64,15 @@ QUICC  *pquicc;
 
 /* CPM interrupt vector functions. */
 struct cpm_action {
-       void    (*handler)(void *);
-       void    *dev_id;
+       irq_handler_t   handler;
+       void            *dev_id;
 };
 static struct  cpm_action cpm_vecs[CPMVEC_NR];
 static void    cpm_interrupt(int irq, void * dev, struct pt_regs * regs);
 static void    cpm_error_interrupt(void *);
 
 /* 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);
 
 
@@ -208,7 +208,7 @@ cpm_error_interrupt(void *dev)
 /* Install a CPM interrupt handler.
 */
 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);

diff --git a/arch/m68k/include/asm/commproc.h b/arch/m68k/include/asm/commproc.h
index c67e09279ea96930a45896df6d77d0f52f645cbe..f41c96863e98bea2870b2c5c12088710842c8a0f 100644 (file)
--- a/arch/m68k/include/asm/commproc.h
+++ b/arch/m68k/include/asm/commproc.h
@@ -649,7 +649,7 @@ typedef struct scc_trans {
 /* #define     CPMVEC_PIO_PC4          ((ushort)0x01) */
 /* #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.
 */