PM / Sleep: Make enter_state() in kernel/power/suspend.c static

The enter_state() function in kernel/power/suspend.c should be
static and state_store() in kernel/power/suspend.c should call
pm_suspend() instead of it, so make that happen (which also reduces
code duplication related to suspend statistics).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>

diff --git a/kernel/power/main.c b/kernel/power/main.c
index b1e324878d5fea591f8d6935ad7cc921e2dfc256..1c12581f1c62ce56bfe61bae08d58745309b0b9d 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -291,12 +291,10 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
 
 #ifdef CONFIG_SUSPEND
        for (s = &pm_states[state]; state < PM_SUSPEND_MAX; s++, state++) {
-               if (*s && len == strlen(*s) && !strncmp(buf, *s, len))
+               if (*s && len == strlen(*s) && !strncmp(buf, *s, len)) {
+                       error = pm_suspend(state);
                        break;
-       }
-       if (state < PM_SUSPEND_MAX && *s) {
-               error = enter_state(state);
-               suspend_stats_update(error);
+               }
        }
 #endif
 

diff --git a/kernel/power/power.h b/kernel/power/power.h
index 398d42b48e9e6f2adadbf1283ac73ef158a5fbe0..98f3622d740713dcf1b6bdfa170b00885d90f121 100644 (file)
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -177,13 +177,11 @@ extern const char *const pm_states[];
 
 extern bool valid_state(suspend_state_t state);
 extern int suspend_devices_and_enter(suspend_state_t state);
-extern int enter_state(suspend_state_t state);
 #else /* !CONFIG_SUSPEND */
 static inline int suspend_devices_and_enter(suspend_state_t state)
 {
        return -ENOSYS;
 }
-static inline int enter_state(suspend_state_t state) { return -ENOSYS; }
 static inline bool valid_state(suspend_state_t state) { return false; }
 #endif /* !CONFIG_SUSPEND */
 

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index e6b5ef9586030aaf1f4db9676b028bc166d367a9..4914358a0543f070f0d42a208a5ace4dabf559d1 100644 (file)
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -272,7 +272,7 @@ static void suspend_finish(void)
  * Fail if that's not the case.  Otherwise, prepare for system suspend, make the
  * system enter the given sleep state and clean up after wakeup.
  */
-int enter_state(suspend_state_t state)
+static int enter_state(suspend_state_t state)
 {
        int error;