diff options
| author | Graeme Russ <graeme.russ@gmail.com> | 2011-07-15 02:21:14 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-07-26 14:54:15 +0200 |
| commit | 17659d7de9e4905f8d06966c2354c87cdeb8b703 (patch) | |
| tree | fc9971a9c9402efeb28c2e7e7cc3ffceba8041d8 /arch/arm/cpu/arm926ejs/kirkwood | |
| parent | 53fc43c68243d5278e522c92002fce3b8cc979a9 (diff) | |
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()
Diffstat (limited to 'arch/arm/cpu/arm926ejs/kirkwood')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/kirkwood/timer.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/timer.c b/arch/arm/cpu/arm926ejs/kirkwood/timer.c index 5beb3f530..b4f6cf87e 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/timer.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/timer.c @@ -88,13 +88,6 @@ DECLARE_GLOBAL_DATA_PTR; #define timestamp gd->tbl #define lastdec gd->lastinc -void reset_timer_masked(void) -{ - /* reset time */ - lastdec = READ_TIMER; - timestamp = 0; -} - ulong get_timer_masked(void) { ulong now = READ_TIMER; @@ -154,7 +147,8 @@ int timer_init(void) writel(cntmrctrl, CNTMR_CTRL_REG); /* init the timestamp and lastdec value */ - reset_timer_masked(); + lastdec = READ_TIMER; + timestamp = 0; return 0; } |