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>

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

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 4914358a0543f070f0d42a208a5ace4dabf559d1..88e5c967370d31e359cbd06f23914735c11f15b2 100644 (file)
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -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);