diff options
Diffstat (limited to 'kernel/power/disk.c')
-rw-r--r-- | kernel/power/disk.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index 027322a564f4..f2cd279d07c7 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c | |||
@@ -52,7 +52,7 @@ static void power_down(suspend_disk_method_t mode) | |||
52 | 52 | ||
53 | switch(mode) { | 53 | switch(mode) { |
54 | case PM_DISK_PLATFORM: | 54 | case PM_DISK_PLATFORM: |
55 | kernel_power_off_prepare(); | 55 | kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK); |
56 | error = pm_ops->enter(PM_SUSPEND_DISK); | 56 | error = pm_ops->enter(PM_SUSPEND_DISK); |
57 | break; | 57 | break; |
58 | case PM_DISK_SHUTDOWN: | 58 | case PM_DISK_SHUTDOWN: |
@@ -119,13 +119,6 @@ static int prepare_processes(void) | |||
119 | goto thaw; | 119 | goto thaw; |
120 | } | 120 | } |
121 | 121 | ||
122 | if (pm_disk_mode == PM_DISK_PLATFORM) { | ||
123 | if (pm_ops && pm_ops->prepare) { | ||
124 | if ((error = pm_ops->prepare(PM_SUSPEND_DISK))) | ||
125 | goto thaw; | ||
126 | } | ||
127 | } | ||
128 | |||
129 | /* Free memory before shutting down devices. */ | 122 | /* Free memory before shutting down devices. */ |
130 | free_some_memory(); | 123 | free_some_memory(); |
131 | return 0; | 124 | return 0; |