From 64a81ed40c830ae78e56518957d219180cc5d461 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Thu, 19 Jul 2007 01:47:28 -0700
Subject: [PATCH] --- yaml --- r: 61539 b: refs/heads/master c:
 127067a9c994dff16b280f409cc7b18a54a63719 h: refs/heads/master i:   61537:
 9781b78b8e652a559358da67a34cbd3da8bf6183   61535:
 8fe5d1eace4ba3347471d6da58aa7c95e4f3b31f v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/power/user.c | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index f2ca6fb3fb8b..507a47841137 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0349828d6d6f95c445674c2953ee9db75c11f8f
+refs/heads/master: 127067a9c994dff16b280f409cc7b18a54a63719
diff --git a/trunk/kernel/power/user.c b/trunk/kernel/power/user.c
index d65305b515b1..09468ec61124 100644
--- a/trunk/kernel/power/user.c
+++ b/trunk/kernel/power/user.c
@@ -181,34 +181,25 @@ static inline int snapshot_suspend(int platform_suspend)
 	return error;
 }
 
-static inline int snapshot_restore(int platform_suspend)
+static inline int snapshot_restore(void)
 {
 	int error;
 
 	mutex_lock(&pm_mutex);
 	pm_prepare_console();
-	if (platform_suspend) {
-		error = platform_prepare();
-		if (error)
-			goto Finish;
-	}
 	suspend_console();
 	error = device_suspend(PMSG_PRETHAW);
 	if (error)
-		goto Resume_devices;
+		goto Finish;
 
 	error = disable_nonboot_cpus();
 	if (!error)
 		error = swsusp_resume();
 
 	enable_nonboot_cpus();
- Resume_devices:
-	if (platform_suspend)
-		platform_finish();
-
+ Finish:
 	device_resume();
 	resume_console();
- Finish:
 	pm_restore_console();
 	mutex_unlock(&pm_mutex);
 	return error;
@@ -274,7 +265,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
 			error = -EPERM;
 			break;
 		}
-		error = snapshot_restore(data->platform_suspend);
+		error = snapshot_restore();
 		break;
 
 	case SNAPSHOT_FREE: