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: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
Acked-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index ac1c114..b901918 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -95,6 +95,22 @@
}
/**
+ * 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.
*
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 8c5014a..b1e3248 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -296,11 +296,7 @@
}
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
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 560a639..03bc92b 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -321,11 +321,7 @@
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;