aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68knommu
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2007-02-07 12:03:01 +1000
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 10:45:33 -0800
commitc051b01129560ea02ea2cebdf00db0721cc9a618 (patch)
treefb182c2e78f2dedfdeb8802d31c2903373e40c01 /arch/m68knommu
parent459c6a9b8ee931e48f6af6637c10ec45521f0536 (diff)
downloadkernel_samsung_aries-c051b01129560ea02ea2cebdf00db0721cc9a618.zip
kernel_samsung_aries-c051b01129560ea02ea2cebdf00db0721cc9a618.tar.gz
kernel_samsung_aries-c051b01129560ea02ea2cebdf00db0721cc9a618.tar.bz2
[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: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68knommu')
-rw-r--r--arch/m68knommu/platform/5307/timers.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/m68knommu/platform/5307/timers.c b/arch/m68knommu/platform/5307/timers.c
index e5668af..87b112b 100644
--- a/arch/m68knommu/platform/5307/timers.c
+++ b/arch/m68knommu/platform/5307/timers.c
@@ -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_writetrr(((MCF_BUSCLK / 16) / HZ), TA(MCFTIMER_TRR));
@@ -111,12 +111,13 @@ unsigned long coldfire_timer_offset(void)
/*
* 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 */
__raw_writeb(MCFTIMER_TER_CAP | MCFTIMER_TER_REF, PA(MCFTIMER_TER));
if (current->pid)
profile_tick(CPU_PROFILING, regs);
+ return IRQ_HANDLED;
}
/***************************************************************************/