aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm34xx.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
-rw-r--r--arch/arm/mach-omap2/pm34xx.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index b77d82665abb..7255d9bce868 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -485,8 +485,6 @@ console_still_active:
485 485
486int omap3_can_sleep(void) 486int omap3_can_sleep(void)
487{ 487{
488 if (!sleep_while_idle)
489 return 0;
490 if (!omap_uart_can_sleep()) 488 if (!omap_uart_can_sleep())
491 return 0; 489 return 0;
492 return 1; 490 return 1;
@@ -522,10 +520,6 @@ static int omap3_pm_suspend(void)
522 struct power_state *pwrst; 520 struct power_state *pwrst;
523 int state, ret = 0; 521 int state, ret = 0;
524 522
525 if (wakeup_timer_seconds || wakeup_timer_milliseconds)
526 omap2_pm_wakeup_on_timer(wakeup_timer_seconds,
527 wakeup_timer_milliseconds);
528
529 /* Read current next_pwrsts */ 523 /* Read current next_pwrsts */
530 list_for_each_entry(pwrst, &pwrst_list, node) 524 list_for_each_entry(pwrst, &pwrst_list, node)
531 pwrst->saved_state = pwrdm_read_next_pwrst(pwrst->pwrdm); 525 pwrst->saved_state = pwrdm_read_next_pwrst(pwrst->pwrdm);