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
+12 -6
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);