diff options
Diffstat (limited to 'kernel/power/main.c')
-rw-r--r-- | kernel/power/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 2f6638ee03c0..46386b9f8dd1 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -295,7 +295,7 @@ static int suspend_enter(suspend_state_t state) | |||
295 | return error; | 295 | return error; |
296 | } | 296 | } |
297 | 297 | ||
298 | error = device_suspend_noirq(PMSG_SUSPEND); | 298 | error = dpm_suspend_noirq(PMSG_SUSPEND); |
299 | if (error) { | 299 | if (error) { |
300 | printk(KERN_ERR "PM: Some devices failed to power down\n"); | 300 | printk(KERN_ERR "PM: Some devices failed to power down\n"); |
301 | goto Platfrom_finish; | 301 | goto Platfrom_finish; |
@@ -335,7 +335,7 @@ static int suspend_enter(suspend_state_t state) | |||
335 | suspend_ops->wake(); | 335 | suspend_ops->wake(); |
336 | 336 | ||
337 | Power_up_devices: | 337 | Power_up_devices: |
338 | device_resume_noirq(PMSG_RESUME); | 338 | dpm_resume_noirq(PMSG_RESUME); |
339 | 339 | ||
340 | Platfrom_finish: | 340 | Platfrom_finish: |
341 | if (suspend_ops->finish) | 341 | if (suspend_ops->finish) |
@@ -363,7 +363,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
363 | } | 363 | } |
364 | suspend_console(); | 364 | suspend_console(); |
365 | suspend_test_start(); | 365 | suspend_test_start(); |
366 | error = device_suspend(PMSG_SUSPEND); | 366 | error = dpm_suspend_start(PMSG_SUSPEND); |
367 | if (error) { | 367 | if (error) { |
368 | printk(KERN_ERR "PM: Some devices failed to suspend\n"); | 368 | printk(KERN_ERR "PM: Some devices failed to suspend\n"); |
369 | goto Recover_platform; | 369 | goto Recover_platform; |
@@ -376,7 +376,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
376 | 376 | ||
377 | Resume_devices: | 377 | Resume_devices: |
378 | suspend_test_start(); | 378 | suspend_test_start(); |
379 | device_resume(PMSG_RESUME); | 379 | dpm_resume_end(PMSG_RESUME); |
380 | suspend_test_finish("resume devices"); | 380 | suspend_test_finish("resume devices"); |
381 | resume_console(); | 381 | resume_console(); |
382 | Close: | 382 | Close: |