evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PM / sleep: Rename platform suspend/resume functions in suspend.c

Browse source 
Rename several local functions related to platform handling during
system suspend resume in suspend.c so that their names better
reflect their roles.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Rafael J. Wysocki 2014-09-30 02:22:24 +02:00
parent 2a8a8ce651
commit ebc3e41e37
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
kernel/power/suspend.c
View file

@ -144,19 +144,19 @@ static int platform_suspend_prepare(suspend_state_t state)
suspend_ops->prepare() : 0; suspend_ops->prepare() : 0;
} }
static int platform_suspend_prepare_late(suspend_state_t state) static int platform_suspend_prepare_noirq(suspend_state_t state)
{ {
return state != PM_SUSPEND_FREEZE && suspend_ops->prepare_late ? return state != PM_SUSPEND_FREEZE && suspend_ops->prepare_late ?
suspend_ops->prepare_late() : 0; suspend_ops->prepare_late() : 0;
} }
static void platform_suspend_wake(suspend_state_t state) static void platform_resume_noirq(suspend_state_t state)
{ {
if (state != PM_SUSPEND_FREEZE && suspend_ops->wake) if (state != PM_SUSPEND_FREEZE && suspend_ops->wake)
suspend_ops->wake(); suspend_ops->wake();
} }
static void platform_suspend_finish(suspend_state_t state) static void platform_resume_finish(suspend_state_t state)
{ {
if (state != PM_SUSPEND_FREEZE && suspend_ops->finish) if (state != PM_SUSPEND_FREEZE && suspend_ops->finish)
suspend_ops->finish(); suspend_ops->finish();
@ -172,7 +172,7 @@ static int platform_suspend_begin(suspend_state_t state)
return 0; return 0;
} }
static void platform_suspend_end(suspend_state_t state) static void platform_resume_end(suspend_state_t state)
{ {
if (state == PM_SUSPEND_FREEZE && freeze_ops && freeze_ops->end) if (state == PM_SUSPEND_FREEZE && freeze_ops && freeze_ops->end)
freeze_ops->end(); freeze_ops->end();
@ -180,7 +180,7 @@ static void platform_suspend_end(suspend_state_t state)
suspend_ops->end(); suspend_ops->end();
} }
static void platform_suspend_recover(suspend_state_t state) static void platform_recover(suspend_state_t state)
{ {
if (state != PM_SUSPEND_FREEZE && suspend_ops->recover) if (state != PM_SUSPEND_FREEZE && suspend_ops->recover)
suspend_ops->recover(); suspend_ops->recover();
@ -275,7 +275,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
printk(KERN_ERR "PM: noirq suspend of devices failed\n"); printk(KERN_ERR "PM: noirq suspend of devices failed\n");
goto Devices_early_resume; goto Devices_early_resume;
} }
error = platform_suspend_prepare_late(state); error = platform_suspend_prepare_noirq(state);
if (error) if (error)
goto Platform_wake; goto Platform_wake;
@ -323,14 +323,14 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
enable_nonboot_cpus(); enable_nonboot_cpus();
Platform_wake: Platform_wake:
platform_suspend_wake(state); platform_resume_noirq(state);
dpm_resume_noirq(PMSG_RESUME); dpm_resume_noirq(PMSG_RESUME);
Devices_early_resume: Devices_early_resume:
dpm_resume_early(PMSG_RESUME); dpm_resume_early(PMSG_RESUME);
Platform_finish: Platform_finish:
platform_suspend_finish(state); platform_resume_finish(state);
return error; return error;
} }
@ -374,11 +374,11 @@ int suspend_devices_and_enter(suspend_state_t state)
trace_suspend_resume(TPS("resume_console"), state, false); trace_suspend_resume(TPS("resume_console"), state, false);
Close: Close:
platform_suspend_end(state); platform_resume_end(state);
return error; return error;
Recover_platform: Recover_platform:
platform_suspend_recover(state); platform_recover(state);
goto Resume_devices; goto Resume_devices;
} }