Commit c051b011 authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds
Browse files

[PATCH] m68knommu: use irq_handler_t passing handler to clock init



Use irq_handler_t for passing interrupt handler around.
Fix optional profiler handler to return a irq_return_t type.
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 459c6a9b
...@@ -62,7 +62,7 @@ void coldfire_tick(void) ...@@ -62,7 +62,7 @@ void coldfire_tick(void)
/***************************************************************************/ /***************************************************************************/
void coldfire_timer_init(irqreturn_t (*handler)(int, void *, struct pt_regs *)) void coldfire_timer_init(irq_handler_t handler)
{ {
__raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR)); __raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR));
__raw_writetrr(((MCF_BUSCLK / 16) / HZ), TA(MCFTIMER_TRR)); __raw_writetrr(((MCF_BUSCLK / 16) / HZ), TA(MCFTIMER_TRR));
...@@ -111,12 +111,13 @@ unsigned long coldfire_timer_offset(void) ...@@ -111,12 +111,13 @@ unsigned long coldfire_timer_offset(void)
/* /*
* Use the other timer to provide high accuracy profiling info. * Use the other timer to provide high accuracy profiling info.
*/ */
void coldfire_profile_tick(int irq, void *dummy, struct pt_regs *regs) irqreturn_t coldfire_profile_tick(int irq, void *dummy)
{ {
/* Reset ColdFire timer2 */ /* Reset ColdFire timer2 */
__raw_writeb(MCFTIMER_TER_CAP | MCFTIMER_TER_REF, PA(MCFTIMER_TER)); __raw_writeb(MCFTIMER_TER_CAP | MCFTIMER_TER_REF, PA(MCFTIMER_TER));
if (current->pid) if (current->pid)
profile_tick(CPU_PROFILING, regs); profile_tick(CPU_PROFILING, regs);
return IRQ_HANDLED;
} }
/***************************************************************************/ /***************************************************************************/
......
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