diff options
Diffstat (limited to 'kernel/power/main.c')
-rw-r--r-- | kernel/power/main.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 854bf0811d40..7d09a9894947 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -58,13 +58,6 @@ int suspend_valid_only_mem(suspend_state_t state) | |||
58 | return state == PM_SUSPEND_MEM; | 58 | return state == PM_SUSPEND_MEM; |
59 | } | 59 | } |
60 | 60 | ||
61 | |||
62 | static inline void pm_finish(suspend_state_t state) | ||
63 | { | ||
64 | if (suspend_ops->finish) | ||
65 | suspend_ops->finish(state); | ||
66 | } | ||
67 | |||
68 | /** | 61 | /** |
69 | * suspend_prepare - Do prep work before entering low-power state. | 62 | * suspend_prepare - Do prep work before entering low-power state. |
70 | * | 63 | * |
@@ -171,7 +164,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
171 | goto Resume_console; | 164 | goto Resume_console; |
172 | } | 165 | } |
173 | if (suspend_ops->prepare) { | 166 | if (suspend_ops->prepare) { |
174 | error = suspend_ops->prepare(state); | 167 | error = suspend_ops->prepare(); |
175 | if (error) | 168 | if (error) |
176 | goto Resume_devices; | 169 | goto Resume_devices; |
177 | } | 170 | } |
@@ -180,7 +173,8 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
180 | suspend_enter(state); | 173 | suspend_enter(state); |
181 | 174 | ||
182 | enable_nonboot_cpus(); | 175 | enable_nonboot_cpus(); |
183 | pm_finish(state); | 176 | if (suspend_ops->finish) |
177 | suspend_ops->finish(); | ||
184 | Resume_devices: | 178 | Resume_devices: |
185 | device_resume(); | 179 | device_resume(); |
186 | Resume_console: | 180 | Resume_console: |