Patchwork [U-Boot,1/5] coldfire: Change timer_init return type from void to int

login
register
mail settings
Submitter stany MARCEL
Date Aug. 30, 2011, 1 p.m.
Message ID <4E5CDEDA.40808@novasys-ingenierie.com>
Download mbox | patch
Permalink /patch/112284/
State Changes Requested
Headers show

Comments

stany MARCEL - Aug. 30, 2011, 1 p.m.
timer_init protorype change for uniformization with other architectures

Signed-off-by: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
---
 arch/m68k/cpu/mcf547x_8x/slicetimer.c |    4 +++-
 arch/m68k/lib/board.c                 |    2 +-
 arch/m68k/lib/time.c                  |    8 ++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)
Mike Frysinger - Aug. 30, 2011, 3:10 p.m.
On Tuesday, August 30, 2011 09:00:10 stany MARCEL wrote:
> --- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
> +++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
> 
> -void timer_init(void)
> +int timer_init(void)

you should have gotten a build error as the prototype is in common.h.  so 
please add an include for common.h to this file.

> --- a/arch/m68k/lib/board.c
> +++ b/arch/m68k/lib/board.c
> 
> -extern	void timer_init(void);
> +extern int timer_init(void);

drop the extern and include common.h

> --- a/arch/m68k/lib/time.c
> +++ b/arch/m68k/lib/time.c
> 
> -void timer_init(void)
> +int timer_init(void)

include common.h in this file too
-mike
Wolfgang Denk - Sept. 2, 2011, 7:52 a.m.
Dear Mike Frysinger,

In message <201108301111.00896.vapier@gentoo.org> you wrote:
>
...
> you should have gotten a build error as the prototype is in common.h.  so=20
> please add an include for common.h to this file.
...
> drop the extern and include common.h
...

When requesting changes to a patch, can you (and everybody else!)

*** P L E A S E ***

update the patch state in Patchworks to "Changes requested" ?

Thanks!

Best regards,

Wolfgang Denk

Patch

diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
index 467a807..ee96aad 100644
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -72,7 +72,7 @@  void dtimer_interrupt(void *not_used)
 	}
 }
 
-void timer_init(void)
+int timer_init(void)
 {
 	volatile slt_t *timerp = (slt_t *) (CONFIG_SYS_TMR_BASE);
 
@@ -93,6 +93,8 @@  void timer_init(void)
 	/* set a period of 1us, set timer mode to restart and
 	   enable timer and interrupt */
 	timerp->cr = SLT_CR_RUN | SLT_CR_IEN | SLT_CR_TEN;
+
+	return 0;
 }
 
 ulong get_timer(ulong base)
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index 945ab66..694289e 100644
--- a/arch/m68k/lib/board.c
+++ b/arch/m68k/lib/board.c
@@ -78,7 +78,7 @@  static char *failed = "*** failed ***\n";
 extern ulong __init_end;
 extern ulong __bss_end__;
 
-extern	void timer_init(void);
+extern int timer_init(void);
 
 #if defined(CONFIG_WATCHDOG)
 # define INIT_FUNC_WATCHDOG_INIT	watchdog_init,
diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index a316cdf..a1eb983 100644
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -91,7 +91,7 @@  void dtimer_interrupt(void *not_used)
 	}
 }
 
-void timer_init(void)
+int timer_init(void)
 {
 	volatile dtmr_t *timerp = (dtmr_t *) (CONFIG_SYS_TMR_BASE);
 
@@ -114,6 +114,8 @@  void timer_init(void)
 	/* set a period of 1us, set timer mode to restart and enable timer and interrupt */
 	timerp->tmr = CONFIG_SYS_TIMER_PRESCALER | DTIM_DTMR_CLK_DIV1 |
 	    DTIM_DTMR_FRR | DTIM_DTMR_ORRI | DTIM_DTMR_RST_EN;
+
+	return 0;
 }
 
 ulong get_timer(ulong base)
@@ -153,7 +155,7 @@  void __udelay(unsigned long usec)
 	}
 }
 
-void timer_init(void)
+int timer_init(void)
 {
 	volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_PIT_BASE);
 	timestamp = 0;
@@ -162,6 +164,8 @@  void timer_init(void)
 	timerp->pcsr = PIT_PCSR_OVW;
 	timerp->pmr = lastinc = 0;
 	timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN;
+
+	return 0;
 }
 
 ulong get_timer(ulong base)