ARM: */timer.c: fix spelling and vertical alignment
PATCH 1/1 ARM: */timer.c: fix spelling and vertical alignment
Signed-off-by Wolfgang Denk <[email protected]>
--- arch/arm/cpu/arm1136/mx31/timer.c | 2 +- arch/arm/cpu/arm1136/omap24xx/timer.c | 22 +++++++++++----------- arch/arm/cpu/arm920t/a320/timer.c | 2 +- arch/arm/cpu/arm926ejs/omap/timer.c | 4 ++-- arch/arm/cpu/arm926ejs/versatile/timer.c | 4 ++-- arch/arm/cpu/arm_cortexa8/mx51/timer.c | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-)
arch/arm/cpu/arm1136/mx31/timer.c +1 -1
@@ -151,7 +151,7 @@ void set_timer (ulong t) timestamp =time_to_tick (t); } -/* delay x useconds AND perserve advance timstamp value */ +/* delay x useconds AND preserve advance timestamp value */ void __udelay (unsigned long usec) {unsigned long long tmp;
arch/arm/cpu/arm1136/omap24xx/timer.c +11 -11
@@ -73,25 +73,25 @@ void set_timer (ulong t) timestamp = t; } -/* delay x useconds AND perserve advance timstamp value */ +/* delay x useconds AND preserve advance timestamp value */ void __udelay (unsigned long usec) {ulong tmo, tmp; -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 /=1000 ;/* finish normalize. */ - }else {/* else small number, don't kill it prior to HZ multiply */ +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 /=1000 ;/* finish normalize. */ + }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 forward will roll time stamp */ +if ( (tmo + tmp +1 ) < tmp )/* if setting this forward will roll time stamp */ reset_timer_masked ();/* reset "advancing" timestamp to 0, set lastinc value */ else - tmo += tmp;/* else, set advancing stamp wake up time */ + tmo += tmp;/* else, set advancing stamp wake up time */ while (get_timer_masked () < tmo)/* loop till event */ /*NOP*/ ; }
@@ -100,16 +100,16 @@ void reset_timer_masked (void) {/* reset time */ lastinc =READ_TIMER ;/* capture current incrementer value time */ - timestamp =0 ;/* start "advancing" time stamp from 0 */ + timestamp =0 ;/* start "advancing" time stamp from 0 */ }ulong get_timer_masked (void ) {ulong now =READ_TIMER ;/* current tick value */ -if (now >= lastinc)/* normal mode (non roll) */ +if (now >= lastinc)/* normal mode (non roll) */ timestamp += (now - lastinc);/* move stamp fordward with absoulte diff ticks */ -else /* we have rollover of incrementer */ +else /* we have rollover of incrementer */ timestamp += (0xFFFFFFFF - lastinc) + now; lastinc = now;return timestamp;
arch/arm/cpu/arm920t/a320/timer.c +1 -1
@@ -155,7 +155,7 @@ void set_timer(ulong t) timestamp = t; } -/* delay x useconds AND perserve advance timstamp value */ +/* delay x useconds AND preserve advance timestamp value */ void udelay (unsigned long usec) {long tmo = usec * (TIMER_CLOCK /1000 ) /1000 ;
arch/arm/cpu/arm926ejs/omap/timer.c +2 -2
@@ -79,14 +79,14 @@ void set_timer (ulong t) timestamp = t; } -/* delay x useconds AND perserve advance timstamp value */ +/* delay x useconds AND preserve advance timestamp value */ void __udelay (unsigned long usec) {ulong tmo, tmp;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 ;
arch/arm/cpu/arm926ejs/versatile/timer.c +2 -2
@@ -108,14 +108,14 @@ void set_timer (ulong t) timestamp = t; } -/* delay x useconds AND perserve advance timstamp value */ +/* delay x useconds AND preserve advance timestamp value */ void __udelay (unsigned long usec) {ulong tmo, tmp;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 ;
arch/arm/cpu/arm_cortexa8/mx51/timer.c +1 -1
@@ -102,7 +102,7 @@ void set_timer(ulong t) timestamp = t; } -/* delay x useconds AND perserve advance timstamp value */ +/* delay x useconds AND preserve advance timestamp value */ void __udelay (unsigned long usec) {unsigned long now, start, tmo;
Signature · 1 line
1.6.6.1