3 files changed, 26 insertions, 26 deletions

diff --git a/kernel/kexec.c b/kernel/kexec.c
index 5a3da87adae0..ae1c35201cc8 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1448,17 +1448,17 @@ int kernel_kexec(void)
                         goto Restore_console;
                 }
                 suspend_console();
-                error = device_suspend(PMSG_FREEZE);
+                error = dpm_suspend_start(PMSG_FREEZE);
                 if (error)
                         goto Resume_console;
-                /* At this point, device_suspend() has been called,
-                 * but *not* device_suspend_noirq(). We *must* call
-                 * device_suspend_noirq() now.  Otherwise, drivers for
+                /* At this point, dpm_suspend_start() has been called,
+                 * but *not* dpm_suspend_noirq(). We *must* call
+                 * dpm_suspend_noirq() now.  Otherwise, drivers for
                  * some devices (e.g. interrupt controllers) become
                  * desynchronized with the actual state of the
                  * hardware at resume time, and evil weirdness ensues.
                  */
-                error = device_suspend_noirq(PMSG_FREEZE);
+                error = dpm_suspend_noirq(PMSG_FREEZE);
                 if (error)
                         goto Resume_devices;
                 error = disable_nonboot_cpus();
@@ -1486,9 +1486,9 @@ int kernel_kexec(void)
                 local_irq_enable();
  Enable_cpus:
                 enable_nonboot_cpus();
-                device_resume_noirq(PMSG_RESTORE);
+                dpm_resume_noirq(PMSG_RESTORE);
  Resume_devices:
-                device_resume(PMSG_RESTORE);
+                dpm_resume_end(PMSG_RESTORE);
  Resume_console:
                 resume_console();
                 thaw_processes();
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 1c18bc894a2d..a9beba68b6c7 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -215,13 +215,13 @@ static int create_image(int platform_mode)
         if (error)
                 return error;
 
-        /* At this point, device_suspend() has been called, but *not*
-         * device_suspend_noirq(). We *must* call device_suspend_noirq() now.
+        /* At this point, dpm_suspend_start() has been called, but *not*
+         * dpm_suspend_noirq(). We *must* call dpm_suspend_noirq() now.
          * Otherwise, drivers for some devices (e.g. interrupt controllers)
          * become desynchronized with the actual state of the hardware
          * at resume time, and evil weirdness ensues.
          */
-        error = device_suspend_noirq(PMSG_FREEZE);
+        error = dpm_suspend_noirq(PMSG_FREEZE);
         if (error) {
                 printk(KERN_ERR "PM: Some devices failed to power down, "
                         "aborting hibernation\n");
@@ -262,7 +262,7 @@ static int create_image(int platform_mode)
 
  Power_up:
         sysdev_resume();
-        /* NOTE:  device_resume_noirq() is just a resume() for devices
+        /* NOTE:  dpm_resume_noirq() is just a resume() for devices
          * that suspended with irqs off ... no overall powerup.
          */
 
@@ -275,7 +275,7 @@ static int create_image(int platform_mode)
  Platform_finish:
         platform_finish(platform_mode);
 
-        device_resume_noirq(in_suspend ?
+        dpm_resume_noirq(in_suspend ?
                 (error ? PMSG_RECOVER : PMSG_THAW) : PMSG_RESTORE);
 
         return error;
@@ -304,7 +304,7 @@ int hibernation_snapshot(int platform_mode)
                 goto Close;
 
         suspend_console();
-        error = device_suspend(PMSG_FREEZE);
+        error = dpm_suspend_start(PMSG_FREEZE);
         if (error)
                 goto Recover_platform;
 
@@ -315,7 +315,7 @@ int hibernation_snapshot(int platform_mode)
         /* Control returns here after successful restore */
 
  Resume_devices:
-        device_resume(in_suspend ?
+        dpm_resume_end(in_suspend ?
                 (error ? PMSG_RECOVER : PMSG_THAW) : PMSG_RESTORE);
         resume_console();
  Close:
@@ -339,7 +339,7 @@ static int resume_target_kernel(bool platform_mode)
 {
         int error;
 
-        error = device_suspend_noirq(PMSG_QUIESCE);
+        error = dpm_suspend_noirq(PMSG_QUIESCE);
         if (error) {
                 printk(KERN_ERR "PM: Some devices failed to power down, "
                         "aborting resume\n");
@@ -394,7 +394,7 @@ static int resume_target_kernel(bool platform_mode)
  Cleanup:
         platform_restore_cleanup(platform_mode);
 
-        device_resume_noirq(PMSG_RECOVER);
+        dpm_resume_noirq(PMSG_RECOVER);
 
         return error;
 }
@@ -414,10 +414,10 @@ int hibernation_restore(int platform_mode)
 
         pm_prepare_console();
         suspend_console();
-        error = device_suspend(PMSG_QUIESCE);
+        error = dpm_suspend_start(PMSG_QUIESCE);
         if (!error) {
                 error = resume_target_kernel(platform_mode);
-                device_resume(PMSG_RECOVER);
+                dpm_resume_end(PMSG_RECOVER);
         }
         resume_console();
         pm_restore_console();
@@ -447,14 +447,14 @@ int hibernation_platform_enter(void)
 
         entering_platform_hibernation = true;
         suspend_console();
-        error = device_suspend(PMSG_HIBERNATE);
+        error = dpm_suspend_start(PMSG_HIBERNATE);
         if (error) {
                 if (hibernation_ops->recover)
                         hibernation_ops->recover();
                 goto Resume_devices;
         }
 
-        error = device_suspend_noirq(PMSG_HIBERNATE);
+        error = dpm_suspend_noirq(PMSG_HIBERNATE);
         if (error)
                 goto Resume_devices;
 
@@ -479,11 +479,11 @@ int hibernation_platform_enter(void)
  Platofrm_finish:
         hibernation_ops->finish();
 
-        device_suspend_noirq(PMSG_RESTORE);
+        dpm_suspend_noirq(PMSG_RESTORE);
 
  Resume_devices:
         entering_platform_hibernation = false;
-        device_resume(PMSG_RESTORE);
+        dpm_resume_end(PMSG_RESTORE);
         resume_console();
 
  Close:
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)
                         return error;
         }
 
-        error = device_suspend_noirq(PMSG_SUSPEND);
+        error = dpm_suspend_noirq(PMSG_SUSPEND);
         if (error) {
                 printk(KERN_ERR "PM: Some devices failed to power down\n");
                 goto Platfrom_finish;
@@ -335,7 +335,7 @@ static int suspend_enter(suspend_state_t state)
                 suspend_ops->wake();
 
  Power_up_devices:
-        device_resume_noirq(PMSG_RESUME);
+        dpm_resume_noirq(PMSG_RESUME);
 
  Platfrom_finish:
         if (suspend_ops->finish)
@@ -363,7 +363,7 @@ int suspend_devices_and_enter(suspend_state_t state)
         }
         suspend_console();
         suspend_test_start();
-        error = device_suspend(PMSG_SUSPEND);
+        error = dpm_suspend_start(PMSG_SUSPEND);
         if (error) {
                 printk(KERN_ERR "PM: Some devices failed to suspend\n");
                 goto Recover_platform;
@@ -376,7 +376,7 @@ int suspend_devices_and_enter(suspend_state_t state)
 
  Resume_devices:
         suspend_test_start();
-        device_resume(PMSG_RESUME);
+        dpm_resume_end(PMSG_RESUME);
         suspend_test_finish("resume devices");
         resume_console();
  Close: