Commit 18c081e2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

ARM: shmobile: Remove the console check from sh7372_enter_suspend()

The !console_suspend_enabled check in sh7372_enter_suspend() seems
to be reversed and the condition it is supposed to catch (console
clock enabled) should be detected by the sh7372_sysc_valid() check
anyway, so remove it.
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
parent 201dbd81
...@@ -424,8 +424,7 @@ static int sh7372_enter_suspend(suspend_state_t suspend_state) ...@@ -424,8 +424,7 @@ static int sh7372_enter_suspend(suspend_state_t suspend_state)
unsigned long msk, msk2; unsigned long msk, msk2;
/* check active clocks to determine potential wakeup sources */ /* check active clocks to determine potential wakeup sources */
if (sh7372_sysc_valid(&msk, &msk2)) { if (sh7372_sysc_valid(&msk, &msk2) && a4s_suspend_ready) {
if (!console_suspend_enabled && a4s_suspend_ready) {
/* convert INTC mask/sense to SYSC mask/sense */ /* convert INTC mask/sense to SYSC mask/sense */
sh7372_setup_sysc(msk, msk2); sh7372_setup_sysc(msk, msk2);
...@@ -434,7 +433,6 @@ static int sh7372_enter_suspend(suspend_state_t suspend_state) ...@@ -434,7 +433,6 @@ static int sh7372_enter_suspend(suspend_state_t suspend_state)
sh7372_enter_a4s_common(0); sh7372_enter_a4s_common(0);
return 0; return 0;
} }
}
/* default to enter A3SM sleep with PLLC0 off */ /* default to enter A3SM sleep with PLLC0 off */
pr_debug("entering A3SM\n"); pr_debug("entering A3SM\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment