Commit 8916e370 authored by Marcos Paulo de Souza's avatar Marcos Paulo de Souza Committed by Rafael J. Wysocki

PM / Suspend: Avoid code duplication in suspend statistics update

The code
       if (error) {
               suspend_stats.fail++;
               dpm_save_failed_errno(error);
       } else
               suspend_stats.success++;

Appears in the kernel/power/main.c and kernel/power/suspend.c.

This patch just creates a new function to avoid duplicated code.
Suggested-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: default avatarMarcos Paulo de Souza <marcos.mage@gmail.com>
Acked-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 3ed3c7b5
......@@ -94,6 +94,22 @@ 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.
......
......@@ -296,11 +296,7 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
}
if (state < PM_SUSPEND_MAX && *s) {
error = enter_state(state);
if (error) {
suspend_stats.fail++;
dpm_save_failed_errno(error);
} else
suspend_stats.success++;
suspend_stats_update(error);
}
#endif
......
......@@ -321,11 +321,7 @@ int pm_suspend(suspend_state_t state)
int ret;
if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX) {
ret = enter_state(state);
if (ret) {
suspend_stats.fail++;
dpm_save_failed_errno(ret);
} else
suspend_stats.success++;
suspend_stats_update(ret);
return ret;
}
return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment