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 ac1c114c499d088e0e9d7bed9f214abe9d924cf2..b901918944416040b4d38e716c6b145244683ba1 100644 (file)
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -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.

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 8c5014a4e05219a44fd6d20a69bd7f776967f09c..b1e324878d5fea591f8d6935ad7cc921e2dfc256 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -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
 

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 560a639614a1934601ca62de7abf9a759b9697da..03bc92b42750e371643112bf2920b91095fe8395 100644 (file)
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -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;