diff options
Diffstat (limited to 'arch/m68k/68360')
-rw-r--r-- | arch/m68k/68360/commproc.c | 8 | ||||
-rw-r--r-- | arch/m68k/68360/config.c | 13 |
2 files changed, 4 insertions, 17 deletions
diff --git a/arch/m68k/68360/commproc.c b/arch/m68k/68360/commproc.c index 315727b7ff40..14d7f35cd37b 100644 --- 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/68360/config.c b/arch/m68k/68360/config.c index 17ec416fed9d..fd1f948c7129 100644 --- a/arch/m68k/68360/config.c +++ b/arch/m68k/68360/config.c @@ -106,19 +106,6 @@ void hw_timer_init(irq_handler_t handler) pquicc->timer_tgcr = tgcr_save; } -int BSP_set_clock_mmss(unsigned long nowtime) -{ -#if 0 - short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60; - - tod->second1 = real_seconds / 10; - tod->second2 = real_seconds % 10; - tod->minute1 = real_minutes / 10; - tod->minute2 = real_minutes % 10; -#endif - return 0; -} - void BSP_reset (void) { local_irq_disable(); |