Skip to contentSkip to conversation

omap24xx: fix 'reset_timer_masked' declaration error

PATCH New Wolfgang Denk 1 participant 2 messages Sep 5, 2011 – Sep 7, 2011 Arm (32-bit)

lore
Share & tools
lore

Wolfgang Denk

author
#0 lore raw

PATCH 1/1 omap24xx: fix 'reset_timer_masked' declaration error

Commit 17659d7 "Timer: Remove reset_timer_masked()" introduced a static declaration for reset_timer_masked() which causes build errors:

timer.c:45: error: static declaration of 'reset_timer_masked' follows non-static declaration include/asm/u-boot-arm.h:70: error: previous declaration of 'reset_timer_masked' was here

Signed-off-by Wolfgang Denk <[email protected]>
Cc Graeme Russ <[email protected]>
Cc Cc: Albert ARIBAUD <[email protected]>
Cc Sandeep Paulraj <[email protected]>
---
 arch/arm/cpu/arm1136/omap24xx/timer.c |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)
arch/arm/cpu/arm1136/omap24xx/timer.c +9 -11
index 73bf4a7..e929ae4 100644
@@ -41,13 +41,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static void reset_timer_masked (void)
-{
-	/* reset time */
-	gd->lastinc = READ_TIMER;	/* capture current incrementer value time */
-	gd->tbl = 0;			/* start "advancing" time stamp from 0 */
-}
-
 int timer_init (void)
 {
 	int32_t val;

@@ -57,7 +50,9 @@ int timer_init (void)
 	val = (CONFIG_SYS_PTV << 2) | BIT5 | BIT1 | BIT0;		/* mask to enable timer*/
 	*((int32_t *) (CONFIG_SYS_TIMERBASE + TCLR)) = val;	/* start timer */
 
-	reset_timer_masked(); /* init the timestamp and lastinc value */
+	/* reset time */
+	gd->lastinc = READ_TIMER;	/* capture current incrementer value */
+	gd->tbl = 0;			/* start "advancing" time stamp */
 
 	return(0);
 }

@@ -84,10 +79,13 @@ void __udelay (unsigned long usec)
 	}
 
 	tmp = get_timer (0);		/* get current timestamp */
-	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
+	if ((tmo + tmp + 1) < tmp) {	/* if setting this forward will roll */
+					/* time stamp, then reset time */
+		gd->lastinc = READ_TIMER;	/* capture incrementer value */
+		gd->tbl = 0;			/* start time stamp */
+	} else {
 		tmo	+= tmp;		/* else, set advancing stamp wake up time */
+	}
 	while (get_timer_masked () < tmo)/* loop till event */
 		/*NOP*/;
 }
Signature · 1 line
1.7.6
author Applied
#1 lore raw

PATCH 1/1 omap24xx: fix 'reset_timer_masked' declaration error

Dear Wolfgang Denk,

Quoted 6 lines · In message <[email protected]> you wrote:

Commit 17659d7 "Timer: Remove reset_timer_masked()" introduced a static declaration for reset_timer_masked() which causes build errors:

timer.c:45: error: static declaration of 'reset_timer_masked' follows non-static declaration include/asm/u-boot-arm.h:70: error: previous declaration of 'reset_timer_masked' was here

Quoted 7 lines
Signed-off-by Wolfgang Denk <[email protected]>
Cc Graeme Russ <[email protected]>
Cc Cc: Albert ARIBAUD <[email protected]>
Cc Sandeep Paulraj <[email protected]>
---
 arch/arm/cpu/arm1136/omap24xx/timer.c |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Few people do business well who do nothing else.
                                       -- Philip Earl of Chesterfield