diff options
| author | Ladislav Michl <ladis@linux-mips.org> | 2009-03-30 18:58:40 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-03-30 18:58:40 +0200 |
| commit | fe672d60b2a8c9e803596ba4533fa1776015551d (patch) | |
| tree | 3f00f5db1ee7e2a4461918276a4d5576640c14ba /cpu | |
| parent | b3f66b0ba09949e0796ce7fad6367f75f15ed890 (diff) | |
| download | u-boot-imx-fe672d60b2a8c9e803596ba4533fa1776015551d.zip u-boot-imx-fe672d60b2a8c9e803596ba4533fa1776015551d.tar.gz u-boot-imx-fe672d60b2a8c9e803596ba4533fa1776015551d.tar.bz2 | |
OMAP: reindent timer code
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/arm925t/interrupts.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/cpu/arm925t/interrupts.c b/cpu/arm925t/interrupts.c index 3ef4554..ce3c4ad 100644 --- a/cpu/arm925t/interrupts.c +++ b/cpu/arm925t/interrupts.c @@ -57,7 +57,7 @@ int interrupt_init (void) /* init the timestamp and lastdec value */ reset_timer_masked(); - return (0); + return 0; } /* @@ -84,17 +84,17 @@ void udelay (unsigned long usec) { ulong tmo, tmp; - if(usec >= 1000){ /* if "big" number, spread normalization to seconds */ + if (usec >= 1000) { /* if "big" number, spread normalization to seconds */ tmo = usec / 1000; /* start to normalize for usec to ticks per sec */ - tmo *= CONFIG_SYS_HZ; /* find number of "ticks" to wait to achieve target */ + tmo *= CONFIG_SYS_HZ; /* find number of "ticks" to wait to achieve target */ tmo /= 1000; /* finish normalize. */ - }else{ /* else small number, don't kill it prior to HZ multiply */ + } else { /* else small number, don't kill it prior to HZ multiply */ tmo = usec * CONFIG_SYS_HZ; tmo /= (1000*1000); } tmp = get_timer (0); /* get current timestamp */ - if( (tmo + tmp + 1) < tmp ) /* if setting this fordward will roll time stamp */ + if ((tmo + tmp + 1) < tmp) /* if setting this fordward will roll time stamp */ reset_timer_masked (); /* reset "advancing" timestamp to 0, set lastdec value */ else tmo += tmp; /* else, set advancing stamp wake up time */ @@ -136,7 +136,7 @@ void udelay_masked (unsigned long usec) #ifdef CONFIG_INNOVATOROMAP1510 #define LOOPS_PER_MSEC 60 /* tuned on omap1510 */ volatile int i, time_remaining = LOOPS_PER_MSEC*usec; - for (i=time_remaining; i>0; i--) { } + for (i=time_remaining; i>0; i--) { } #else ulong tmo; @@ -145,7 +145,7 @@ void udelay_masked (unsigned long usec) if (usec >= 1000) { /* if "big" number, spread normalization to seconds */ tmo = usec / 1000; /* start to normalize for usec to ticks per sec */ - tmo *= CONFIG_SYS_HZ; /* find number of "ticks" to wait to achieve target */ + tmo *= CONFIG_SYS_HZ; /* find number of "ticks" to wait to achieve target */ tmo /= 1000; /* finish normalize. */ } else { /* else small number, don't kill it prior to HZ multiply */ tmo = usec * CONFIG_SYS_HZ; @@ -176,8 +176,5 @@ unsigned long long get_ticks(void) */ ulong get_tbclk (void) { - ulong tbclk; - - tbclk = CONFIG_SYS_HZ; - return tbclk; + return CONFIG_SYS_HZ; } |