[RFC][PATCH 1/4] swsusp: Remove incorrect code from user.c

Rafael J. Wysocki
2007-05-17T22:24:07Z

From: Rafael J. Wysocki <rjw@sisk.pl>

Make the code hibernation code in kernel/power/user.c be functionally equivalent
to the corresponding code in kernel/power/disk.c , as it should be.

The calls to the platform functions removed by this patch are incorrect. They
should be replaced with some other "platform" operations that will be
introduced in one of the subsequent patches.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
kernel/power/user.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)

Index: linux-2.6.21/kernel/power/user.c
===================================================================
--- linux-2.6.21.orig/kernel/power/user.c 2007-05-08 22:10:36.000000000 +0200
+++ linux-2.6.21/kernel/power/user.c 2007-05-08 23:03:17.000000000 +0200
@@ -179,34 +179,25 @@ static inline int snapshot_suspend(int p
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;
@@ -272,7 +263,7 @@ static int snapshot_ioctl(struct inode *
error = -EPERM;
break;
}
- error = snapshot_restore(data->platform_suspend);
+ error = snapshot_restore();
break;