Skip to content

Commit

Permalink
ARM: shmobile: Remove the console check from sh7372_enter_suspend()
Browse files Browse the repository at this point in the history
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: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Magnus Damm <damm@opensource.se>
  • Loading branch information
Rafael J. Wysocki committed Sep 3, 2012
1 parent 201dbd8 commit 18c081e
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions arch/arm/mach-shmobile/pm-sh7372.c
Original file line number Diff line number Diff line change
Expand Up @@ -424,16 +424,14 @@ static int sh7372_enter_suspend(suspend_state_t suspend_state)
unsigned long msk, msk2;

/* check active clocks to determine potential wakeup sources */
if (sh7372_sysc_valid(&msk, &msk2)) {
if (!console_suspend_enabled && a4s_suspend_ready) {
/* convert INTC mask/sense to SYSC mask/sense */
sh7372_setup_sysc(msk, msk2);

/* enter A4S sleep with PLLC0 off */
pr_debug("entering A4S\n");
sh7372_enter_a4s_common(0);
return 0;
}
if (sh7372_sysc_valid(&msk, &msk2) && a4s_suspend_ready) {
/* convert INTC mask/sense to SYSC mask/sense */
sh7372_setup_sysc(msk, msk2);

/* enter A4S sleep with PLLC0 off */
pr_debug("entering A4S\n");
sh7372_enter_a4s_common(0);
return 0;
}

/* default to enter A3SM sleep with PLLC0 off */
Expand Down

0 comments on commit 18c081e

Please sign in to comment.