Subject: [PATCH 2/3] ARM: OMAP4: Fix build error and warning in timer.c

From: [email-masked] (Igor Grinberg)
Date: Wed, 28 Nov 2012 08:40:27 +0200

On 11/28/12 04:15, Jon Hunter wrote:
> When compiling the kernel with configuration option CONFIG_ARCH_OMAP4
> enabled and CONFIG_LOCAL_TIMERS disabled, the following build error and
> warning is seen.
> 
>   CC      arch/arm/mach-omap2/timer.o
>   arch/arm/mach-omap2/timer.c: In function ?omap4_local_timer_init?:
>   arch/arm/mach-omap2/timer.c:630:2: error: implicit declaration of
>   	function ?omap4_sync32_timer_init?
> 	[-Werror=implicit-function-declaration]
>   arch/arm/mach-omap2/timer.c: At top level:
>   arch/arm/mach-omap2/timer.c:607:1: warning: ?omap4_sync32k_timer_init?
>   	defined but not used [-Wunused-function]
>   cc1: some warnings being treated as errors
>   make[1]: *** [arch/arm/mach-omap2/timer.o] Error 1
> 
> This issue was introduced by commit 6f80b3b (ARM: OMAP2+: timer: remove
> CONFIG_OMAP_32K_TIMER) where the "k" is missing from the "sync32k" in
> the function name "omap4_sync32_timer_init". Therefore, correct this
> typo to resolve the above error and warning.

Yeah ;-( sorry for this...

> 
> Cc: Igor Grinberg <[email-masked]>
> 
> Reported-by: Tony Lindgren <[email-masked]>
> Signed-off-by: Jon Hunter <[email-masked]>

Acked-by: Igor Grinberg <[email-masked]>

> ---
>  arch/arm/mach-omap2/timer.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
> index a9f99e3..eb96712 100644
> --- a/arch/arm/mach-omap2/timer.c
> +++ b/arch/arm/mach-omap2/timer.c
> @@ -627,7 +627,7 @@ static void __init omap4_local_timer_init(void)
>  #else /* CONFIG_LOCAL_TIMERS */
>  static inline void omap4_local_timer_init(void)
>  {
> -	omap4_sync32_timer_init();
> +	omap4_sync32k_timer_init();
>  }
>  #endif /* CONFIG_LOCAL_TIMERS */
>  OMAP_SYS_TIMER(4, local);

-- 
Regards,
Igor.