summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2006-08-30 14:09:47 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-09-25 21:08:38 -0700
commit1d3a82af45428c5e8deaa119cdeb79611ae46371 (patch)
treee8e5b7a03a979e149541149cab5570352b90656f /kernel
parent1ebfd79eb46a89eacf3cbdf4a463d5d572d3557b (diff)
downloadop-kernel-dev-1d3a82af45428c5e8deaa119cdeb79611ae46371.zip
op-kernel-dev-1d3a82af45428c5e8deaa119cdeb79611ae46371.tar.gz
PM: no suspend_prepare() phase
Remove the new suspend_prepare() phase. It doesn't seem very usable, has never been tested, doesn't address fault cleanup, and would need a sibling resume_complete(); plus there are no real use cases. It could be restored later if those issues get resolved. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Cc: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 0c3ed6a..6d295c7 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -57,10 +57,6 @@ static int suspend_prepare(suspend_state_t state)
if (!pm_ops || !pm_ops->enter)
return -EPERM;
- error = device_prepare_suspend(PMSG_SUSPEND);
- if (error)
- return error;
-
pm_prepare_console();
disable_nonboot_cpus();
OpenPOWER on IntegriCloud