From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 15:02:36 +0000 (+0800)
Subject: Revert "PM: Enable early suspend through /sys/power/state"
X-Git-Tag: firefly_0821_release~9862
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=78f25647d53f87b2348a7320467a83575d59a9a2;p=firefly-linux-kernel-4.4.55.git

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 77a3584d253f..347d2cc88cd0 100644
--- 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 cd515ba1c8ce..6f10dfc2d3e9 100644
--- 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",
 };