android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: s3c24xx: Do not confuse local define with Kconfig

Browse Source 
Drop CONFIG_ prefix from a local DEBUG_RESUME define guarding some
debugging code to avoid any confusion with Kconfig options.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
This commit is contained in:
Krzysztof Kozlowski
2017-07-17 07:48:09 +02:00
parent 4d93cb41d3
commit b1dce7132c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-s3c24xx/sleep.S
View File

@ -33,10 +33,11 @@
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
/* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not /*
* S3C24XX_DEBUG_RESUME is dangerous if your bootloader does not
* reset the UART configuration, only enable if you really need this! * reset the UART configuration, only enable if you really need this!
*/ */
//#define CONFIG_DEBUG_RESUME //#define S3C24XX_DEBUG_RESUME
.text .text
@ -71,13 +72,13 @@ ENTRY(s3c_cpu_resume)
str r12, [ r14, #0x54 ] str r12, [ r14, #0x54 ]
#endif #endif
#ifdef CONFIG_DEBUG_RESUME #ifdef S3C24XX_DEBUG_RESUME
mov r3, #'L' mov r3, #'L'
strb r3, [ r2, #S3C2410_UTXH ] strb r3, [ r2, #S3C2410_UTXH ]
1001: 1001:
ldrb r14, [ r3, #S3C2410_UTRSTAT ] ldrb r14, [ r3, #S3C2410_UTRSTAT ]
tst r14, #S3C2410_UTRSTAT_TXE tst r14, #S3C2410_UTRSTAT_TXE
beq 1001b beq 1001b
#endif /* CONFIG_DEBUG_RESUME */ #endif /* S3C24XX_DEBUG_RESUME */
b cpu_resume b cpu_resume