From bdd7a0103bbd61bdff00587f2b12c6798efdd931 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Mon, 13 Feb 2012 16:29:24 +0100
Subject: [PATCH] --- yaml --- r: 291855 b: refs/heads/master c:
 93e1ee43a72b11e1b50aab87046c131a836a4456 h: refs/heads/master i:   291853:
 6c224ac5993de3c82ba5f0ec81afa0c5a0217eeb   291851:
 8d290b615f6785e436e96976a5990e4912741f2c   291847:
 04e0145d94b91a8443ea49e25d04030607250b3d   291839:
 78f3b13581fbbb2fb5b84a1bd8d36e9ee2a8cea2 v: v3

---
 [refs]                       | 2 +-
 trunk/kernel/power/main.c    | 8 +++-----
 trunk/kernel/power/power.h   | 2 --
 trunk/kernel/power/suspend.c | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 839253f38d3c..21e4ecd068c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55ae451918ec62e553f11b6118fec157f90c31c3
+refs/heads/master: 93e1ee43a72b11e1b50aab87046c131a836a4456
diff --git a/trunk/kernel/power/main.c b/trunk/kernel/power/main.c
index b1e324878d5f..1c12581f1c62 100644
--- a/trunk/kernel/power/main.c
+++ b/trunk/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/trunk/kernel/power/power.h b/trunk/kernel/power/power.h
index 398d42b48e9e..98f3622d7407 100644
--- a/trunk/kernel/power/power.h
+++ b/trunk/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/trunk/kernel/power/suspend.c b/trunk/kernel/power/suspend.c
index e6b5ef958603..4914358a0543 100644
--- a/trunk/kernel/power/suspend.c
+++ b/trunk/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;