UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

PM / Sleep: Drop suspend_stats_update() 

Since suspend_stats_update() is only called from pm_suspend(),
move its code directly into that function and remove the static
inline definition from include/linux/suspend.h.  Clean_up
pm_suspend() in the process.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
This commit is contained in:
Rafael J. Wysocki 2012-02-13 16:29:33 +01:00
parent 93e1ee43a7
commit bc25cf5089
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/linux/suspend.h
View File

@ -94,22 +94,6 @@ static inline void dpm_save_failed_step(enum suspend_stat_step step)
suspend_stats.last_failed_step %= REC_FAILED_NUM;
}
/**
* suspend_stats_update - Update success/failure statistics of suspend-to-ram
*
* @error: Value returned by enter_state() function
*/
static inline void suspend_stats_update(int error)
{
if (error) {
suspend_stats.fail++;
dpm_save_failed_errno(error);
} else {
suspend_stats.success++;
}
}
/**
* struct platform_suspend_ops - Callbacks for managing platform dependent
* system sleep states.

18
kernel/power/suspend.c
View File

@ -316,12 +316,18 @@ static int enter_state(suspend_state_t state)
*/
int pm_suspend(suspend_state_t state)
{
int ret;
if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX) {
ret = enter_state(state);
suspend_stats_update(ret);
return ret;
int error;
if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
return -EINVAL;
error = enter_state(state);
if (error) {
suspend_stats.fail++;
dpm_save_failed_errno(error);
} else {
suspend_stats.success++;
}
return -EINVAL;
return error;
}
EXPORT_SYMBOL(pm_suspend);