[PATCH 12/17] ARM clps711x: Simple optimise debug_macro by removing one NOP

[Russell King - ARM Linux]

On Sat, Apr 21, 2012 at 01:11:25PM +0400, Alexander Shiyan wrote:
> 
> Signed-off-by: Alexander Shiyan <shc_work at mail.ru>
> ---
>  arch/arm/mach-clps711x/include/mach/debug-macro.S |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-clps711x/include/mach/debug-macro.S b/arch/arm/mach-clps711x/include/mach/debug-macro.S
> index 118b3d9..37c4d8a 100644
> --- a/arch/arm/mach-clps711x/include/mach/debug-macro.S
> +++ b/arch/arm/mach-clps711x/include/mach/debug-macro.S
> @@ -14,10 +14,8 @@
>  #include <mach/hardware.h>
>  
>  		.macro	addruart, rp, rv, tmp
> -#ifndef CONFIG_DEBUG_CLPS711X_UART2
> -		mov	\rp, #0x0000	@ UART1
> -#else
> -		mov	\rp, #0x1000	@ UART2
> +#ifdef CONFIG_DEBUG_CLPS711X_UART2
> +		mov	\rp, #0x1000	@ Add offset for UART2 base reg
>  #endif

This looks wrong.  How is rp initialized if CONFIG_DEBUG_CLPS711X_UART2 is
not set?