PM: Rename device_power_down/up()

[sfrench/cifs-2.6.git] / kernel / power / main.c

diff --git a/kernel/power/main.c b/kernel/power/main.c
index f99ed6a75eac434c7720607fefb480771eae3df5..2f6638ee03c05649b8039a6fc6bd7fa01d1e19fc 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -289,15 +289,13 @@ static int suspend_enter(suspend_state_t state)
 {
        int error;
 
-       device_pm_lock();
-
        if (suspend_ops->prepare) {
                error = suspend_ops->prepare();
                if (error)
-                       goto Done;
+                       return error;
        }
 
-       error = device_power_down(PMSG_SUSPEND);
+       error = device_suspend_noirq(PMSG_SUSPEND);
        if (error) {
                printk(KERN_ERR "PM: Some devices failed to power down\n");
                goto Platfrom_finish;
@@ -337,15 +335,12 @@ static int suspend_enter(suspend_state_t state)
                suspend_ops->wake();
 
  Power_up_devices:
-       device_power_up(PMSG_RESUME);
+       device_resume_noirq(PMSG_RESUME);
 
  Platfrom_finish:
        if (suspend_ops->finish)
                suspend_ops->finish();
 
- Done:
-       device_pm_unlock();
-
        return error;
 }