Revert "PM: Enable early suspend through /sys/power/state"

This reverts commit 5f36bdf15970bf5ef97dce533ddac32d85191d6b.

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 77a3584d253f4e9901e1d6dacdc77a348c69dfab..347d2cc88cd0e1a824f1004c4288d5d4a8e2959c 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -147,11 +147,7 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
                           const char *buf, size_t n)
 {
 #ifdef CONFIG_SUSPEND
-#ifdef CONFIG_EARLYSUSPEND
-       suspend_state_t state = PM_SUSPEND_ON;
-#else
        suspend_state_t state = PM_SUSPEND_STANDBY;
-#endif
        const char * const *s;
 #endif
        char *p;
@@ -173,14 +169,7 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
                        break;
        }
        if (state < PM_SUSPEND_MAX && *s)
-#ifdef CONFIG_EARLYSUSPEND
-               if (state == PM_SUSPEND_ON || valid_state(state)) {
-                       error = 0;
-                       request_suspend_state(state);
-               }
-#else
                error = enter_state(state);
-#endif
 #endif
 
  Exit:

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index cd515ba1c8ce976f340da0c5aab7a0cd7447cdb0..6f10dfc2d3e9f79a0a57cd73b8a70ad2cc90d22b 100644 (file)
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -19,9 +19,6 @@
 #include "power.h"
 
 const char *const pm_states[PM_SUSPEND_MAX] = {
-#ifdef CONFIG_EARLYSUSPEND
-       [PM_SUSPEND_ON]         = "on",
-#endif
        [PM_SUSPEND_STANDBY]    = "standby",
        [PM_SUSPEND_MEM]        = "mem",
 };