3 files changed, 0 insertions, 49 deletions
diff --git a/arch/arm/mach-ux500/pm/cpuidle.c b/arch/arm/mach-ux500/pm/cpuidle.c
index ac5924c558e..522cf4b39ee 100644
--- a/arch/arm/mach-ux500/pm/cpuidle.c
+++ b/arch/arm/mach-ux500/pm/cpuidle.c
@@ -481,9 +481,6 @@ static int enter_sleep(struct cpuidle_device *dev,
 		spin_unlock(&cpuidle_lock);
 	}
 
-	/* TODO: To use desc as debug print might be a bad idea */
-	ux500_ci_dbg_msg(cstates[target].desc);
-
 	if (cstates[target].ARM == ARM_OFF) {
 		context_varm_save_common();
 		spin_lock(&cpuidle_lock);
diff --git a/arch/arm/mach-ux500/pm/cpuidle_dbg.c b/arch/arm/mach-ux500/pm/cpuidle_dbg.c
index 77b1f218ddb..2639277d5be 100644
--- a/arch/arm/mach-ux500/pm/cpuidle_dbg.c
+++ b/arch/arm/mach-ux500/pm/cpuidle_dbg.c
@@ -27,7 +27,6 @@
 #include "pm.h"
 #include "timer.h"
 
-#define DBG_BUF_SIZE 5000
 #define APE_ON_TIMER_INTERVAL 5 /* Seconds */
 
 #define UART_RX_GPIO_PIN_MASK (1 << (CONFIG_UX500_CONSOLE_UART_GPIO_PIN % 32))
@@ -83,44 +82,6 @@ static struct cstate *cstates;
 static int cstates_len;
 static DEFINE_SPINLOCK(dbg_lock);
 
-#ifdef U8500_CPUIDLE_EXTRA_DBG
-void ux500_ci_dbg_msg(char *dbg_string)
-{
-	static char dbg_buf[DBG_BUF_SIZE];
-	static int index; /* protected by dbg_lock */
-	int str_len;
-	int smp_no_len;
-	int head_len;
-	unsigned long flags;
-	static const char * const smp_no_str = "\n  %d:";
-	static const char * const head_str = ":HEAD->";
-
-	spin_lock_irqsave(&dbg_lock, flags);
-
-	str_len = strlen(dbg_string);
-	smp_no_len = strlen(smp_no_str);
-	head_len = strlen(head_str);
-
-	if (index > head_len)
-		/* Remove last head printing */
-		index -= head_len;
-
-	if ((index + str_len + smp_no_len + head_len) > DBG_BUF_SIZE)
-		index = 0; /* Non perfect wrapping... */
-
-	sprintf(&dbg_buf[index], smp_no_str, smp_processor_id());
-	index += smp_no_len;
-
-	strcpy(&dbg_buf[index], dbg_string);
-	index += str_len;
-
-	strcpy(&dbg_buf[index], head_str);
-	index += head_len;
-
-	spin_unlock_irqrestore(&dbg_lock, flags);
-}
-#endif
-
 bool ux500_ci_dbg_force_ape_on(void)
 {
 	clk_enable(uart_clk);
diff --git a/arch/arm/mach-ux500/pm/cpuidle_dbg.h b/arch/arm/mach-ux500/pm/cpuidle_dbg.h
index c2d6a85e48f..143b8cf48d8 100644
--- a/arch/arm/mach-ux500/pm/cpuidle_dbg.h
+++ b/arch/arm/mach-ux500/pm/cpuidle_dbg.h
@@ -27,12 +27,6 @@ void ux500_ci_dbg_console_check_uart(void);
 void ux500_ci_dbg_console_handle_ape_resume(void);
 void ux500_ci_dbg_console_handle_ape_suspend(void);
 
-#ifdef U8500_CPUIDLE_EXTRA_DBG
-void ux500_ci_dbg_msg(char *dbg_string);
-#else
-static inline void ux500_ci_dbg_msg(char *dbg_string) { }
-#endif
-
 #else
 
 static inline void ux500_ci_dbg_init(void) { }
@@ -61,7 +55,6 @@ static inline void ux500_ci_dbg_console(void) { }
 static inline void ux500_ci_dbg_console_check_uart(void) { }
 static inline void ux500_ci_dbg_console_handle_ape_resume(void) { }
 static inline void ux500_ci_dbg_console_handle_ape_suspend(void) { }
-static inline void ux500_ci_dbg_msg(char *dbg_string) { }
 
 #endif
 #endif