From c97d9320c669d63b8c0bcd1c1b203af98d8aa34e Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Mon, 5 Dec 2011 10:27:42 -0800 Subject: ARM: msm: Drop useless teq from DEBUG_LL support This teq was first introduced in bcc0f6a ([ARM] msm: clean up iomap and devices, 2008-09-10). It seems that DEBUG_LL support on MSM at the time had to remove the virtual mapping for the uart base. Thus when the MMU was enabled the addruart macro returned 0 and the senduart macro would test for 0 and do nothing. It was a simple way to turn off DEBUG_LL when the MMU was enabled. The virtual mapping was added back in 6339f66 (msm: make debugging UART (for DEBUG_LL) configurable, 2009-11-02) but the patch forgot to remove the teq here. So as it stands the teq has been useless for two years and DEBUG_LL works fine without it. Cc: Nicolas Pitre Signed-off-by: Stephen Boyd Signed-off-by: David Brown --- arch/arm/mach-msm/include/mach/debug-macro.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/mach-msm/include') diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S index 3ffd8668c9a..0e05f88abcd 100644 --- a/arch/arm/mach-msm/include/mach/debug-macro.S +++ b/arch/arm/mach-msm/include/mach/debug-macro.S @@ -30,8 +30,7 @@ @ Write the 1 character to UARTDM_TF str \rd, [\rx, #0x70] #else - teq \rx, #0 - strne \rd, [\rx, #0x0C] + str \rd, [\rx, #0x0C] #endif .endm -- cgit v1.2.3