From 5c8404aff16c2a207a11e1af5843e1009bf9fb01 Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Fri, 15 Jul 2011 02:18:12 +0000 Subject: Timer: Remove set_timer completely --- arch/sh/lib/time.c | 7 +------ arch/sh/lib/time_sh2.c | 9 ++------- 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'arch/sh/lib') diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c index bc1656f73c..c4bfc8638c 100644 --- a/arch/sh/lib/time.c +++ b/arch/sh/lib/time.c @@ -139,15 +139,10 @@ unsigned long get_timer (unsigned long base) return tick_to_time(get_ticks()) - base; } -void set_timer (unsigned long t) -{ - writel((0 - t), TCNT0); -} - void reset_timer (void) { tmu_timer_stop(0); - set_timer (0); + writel(0, TCNT0); tmu_timer_start(0); } diff --git a/arch/sh/lib/time_sh2.c b/arch/sh/lib/time_sh2.c index 789b46f0e0..a5c838bff0 100644 --- a/arch/sh/lib/time_sh2.c +++ b/arch/sh/lib/time_sh2.c @@ -54,7 +54,7 @@ int timer_init(void) /* User Device 0 only */ cmt_timer_stop(0); - set_timer(CMT_TIMER_RESET); + writew(CMT_TIMER_RESET, CMCOR_0); cmt_timer_start(0); return 0; @@ -90,15 +90,10 @@ ulong get_timer(ulong base) return (get_usec() / 1000) - base; } -void set_timer(ulong t) -{ - writew((u16) t, CMCOR_0); -} - void reset_timer(void) { cmt_timer_stop(0); - set_timer(CMT_TIMER_RESET); + writew(CMT_TIMER_RESET, CMCOR_0); cmt0_timer = 0; cmt_timer_start(0); } -- cgit v1.2.1