From: Michael Spang <spang@chromium.org>
Date: Fri, 9 Nov 2012 03:09:24 +0000 (-0500)
Subject: CHROMIUM: serial: samsung: Use printk instead of printascii for S3C_PMDBG
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2f608a900d028a39ec5aa128e8c45e9e0eb770d4;p=people%2Faperard%2Flinux-chromebook.git

CHROMIUM: serial: samsung: Use printk instead of printascii for S3C_PMDBG

Users should use no_console_suspend if they want output during
suspend, rather than relying on DEBUG_LL. Using DEBUG_LL has two
disadvantages:

1. It doesn't respect power management. When the UART is suspended
   the clock is stopped, and trying to use DEBUG_LL will just hang.

   This means if the user selects CONFIG_SAMSUNG_PM_DEBUG but does
   NOT disable console suspend, the system will hang during suspend.

2. It skips syslog and other console devices such as pstore.

BUG=chrome-os-partner:10932
TEST=powerd_suspend with no_console_suspend but not SAMSUNG_PM_DEBUG

Signed-off-by: Michael Spang <spang@chromium.org>
Change-Id: Ieb511b164eb81119c9f1c59d793d37351a05f7c9
Reviewed-on: https://gerrit.chromium.org/gerrit/37755
Reviewed-by: Abhilash Kesavan <a.kesavan@samsung.com>
Reviewed-by: Olof Johansson <olofj@chromium.org>
---

diff --git a/arch/arm/plat-samsung/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h
index 865a75ec48ee9..da892d83633f0 100644
--- a/arch/arm/plat-samsung/include/plat/pm.h
+++ b/arch/arm/plat-samsung/include/plat/pm.h
@@ -122,21 +122,7 @@ extern struct syscore_ops s3c24xx_irq_syscore_ops;
 
 /* PM debug functions */
 
-#ifdef CONFIG_SAMSUNG_PM_DEBUG
-/**
- * s3c_pm_dbg() - low level debug function for use in suspend/resume.
- * @msg: The message to print.
- *
- * This function is used mainly to debug the resume process before the system
- * can rely on printk/console output. It uses the low-level debugging output
- * routine printascii() to do its work.
- */
-extern void s3c_pm_dbg(const char *msg, ...);
-
-#define S3C_PMDBG(fmt...) s3c_pm_dbg(fmt)
-#else
 #define S3C_PMDBG(fmt...) printk(KERN_DEBUG fmt)
-#endif
 
 #ifdef CONFIG_S3C_PM_DEBUG_LED_SMDK
 /**
diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c
index 76962d2a19b50..99d7a9a950094 100644
--- a/arch/arm/plat-samsung/pm.c
+++ b/arch/arm/plat-samsung/pm.c
@@ -43,19 +43,6 @@ unsigned long s3c_pm_flags;
 */
 
 #ifdef CONFIG_SAMSUNG_PM_DEBUG
-extern void printascii(const char *);
-
-void s3c_pm_dbg(const char *fmt, ...)
-{
-	va_list va;
-	char buff[256];
-
-	va_start(va, fmt);
-	vsprintf(buff, fmt, va);
-	va_end(va);
-
-	printascii(buff);
-}
 
 static inline void s3c_pm_debug_init(void)
 {