1 files changed, 0 insertions, 20 deletions

diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index ef8595c8029..b8822f8b289 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -30,7 +30,6 @@
 #include <linux/irq.h>
 #include <linux/time.h>
 #include <linux/gpio.h>
-#include <linux/console.h>
 
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
@@ -127,27 +126,11 @@ static void omap2_enter_full_retention(void)
         if (omap_irq_pending())
                 goto no_sleep;
 
-        /* Block console output in case it is on one of the OMAP UARTs */
-        if (!is_suspending())
-                if (!console_trylock())
-                        goto no_sleep;
-
-        omap_uart_prepare_idle(0);
-        omap_uart_prepare_idle(1);
-        omap_uart_prepare_idle(2);
-
         /* Jump to SRAM suspend code */
         omap2_sram_suspend(sdrc_read_reg(SDRC_DLLA_CTRL),
                            OMAP_SDRC_REGADDR(SDRC_DLLA_CTRL),
                            OMAP_SDRC_REGADDR(SDRC_POWER));
 
-        omap_uart_resume_idle(2);
-        omap_uart_resume_idle(1);
-        omap_uart_resume_idle(0);
-
-        if (!is_suspending())
-                console_unlock();
-
 no_sleep:
         omap2_gpio_resume_after_idle();
 
@@ -239,8 +222,6 @@ static int omap2_can_sleep(void)
 {
         if (omap2_fclks_active())
                 return 0;
-        if (!omap_uart_can_sleep())
-                return 0;
         if (osc_ck->usecount > 1)
                 return 0;
         if (omap_dma_running())
@@ -291,7 +272,6 @@ static int omap2_pm_suspend(void)
         mir1 = omap_readl(0x480fe0a4);
         omap_writel(1 << 5, 0x480fe0ac);
 
-        omap_uart_prepare_suspend();
         omap2_enter_full_retention();
 
         omap_writel(mir1, 0x480fe0a4);