From 17659d7de9e4905f8d06966c2354c87cdeb8b703 Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Fri, 15 Jul 2011 02:21:14 +0000 Subject: Timer: Remove reset_timer_masked() In some circumstances, reset_timer_masked() was called be timer_init() in order to perform architecture specific timer initialisation. In such cases, the required code in reset_timer_masked() has been moved into timer_init() --- arch/arm/cpu/pxa/timer.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'arch/arm/cpu/pxa/timer.c') diff --git a/arch/arm/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c index 44dae9a98f2..28667454722 100644 --- a/arch/arm/cpu/pxa/timer.c +++ b/arch/arm/cpu/pxa/timer.c @@ -59,7 +59,7 @@ static inline unsigned long long us_to_tick(unsigned long long us) int timer_init (void) { - reset_timer_masked(); + writel(0, OSCR); return 0; } @@ -74,12 +74,6 @@ void __udelay (unsigned long usec) udelay_masked (usec); } - -void reset_timer_masked (void) -{ - writel(0, OSCR); -} - ulong get_timer_masked (void) { return tick_to_time(get_ticks()); -- cgit v1.2.3