diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-08-15 20:57:06 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-04 01:45:00 +0200 |
| commit | 18c081e27666c5db33075bf7ae4694e091cf1d20 (patch) | |
| tree | 4d812e02695c23cb97e56369215f011c80afd438 /arch/arm | |
| parent | 201dbd8110164d817e73c5602dd4d358d7fc535a (diff) | |
| download | op-kernel-dev-18c081e27666c5db33075bf7ae4694e091cf1d20.zip op-kernel-dev-18c081e27666c5db33075bf7ae4694e091cf1d20.tar.gz | |
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: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Magnus Damm <damm@opensource.se>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-shmobile/pm-sh7372.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c index 9d055a9..d01122c 100644 --- a/arch/arm/mach-shmobile/pm-sh7372.c +++ b/arch/arm/mach-shmobile/pm-sh7372.c @@ -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 */ |
