Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM: Add empty suspend/resume device irq functions
  PM/Hibernate: Move NVS routines into a seperate file (v2).
  PM/Hibernate: Rename disk.c to hibernate.c
  PM: Separate suspend to RAM functionality from core
  Driver Core: Rework platform suspend/resume, print warning
  PM: Remove device_type suspend()/resume()
  PM/Hibernate: Move memory shrinking to snapshot.c (rev. 2)
  PM/Suspend: Do not shrink memory before suspend
  PM: Remove bus_type suspend_late()/resume_early() V2
  PM core: rename suspend and resume functions
  PM: Rename device_power_down/up()
  PM: Remove unused asm/suspend.h
  x86: unify power/cpu_(32|64).c
  x86: unify power/cpu_(32|64) copyright notes
  x86: unify power/cpu_(32|64) regarding restoring processor state
  x86: unify power/cpu_(32|64) regarding saving processor state
  x86: unify power/cpu_(32|64) global variables
  x86: unify power/cpu_(32|64) headers
  PM: Warn if interrupts are enabled during suspend-resume of sysdevs
  PM/ACPI/x86: Fix sparse warning in arch/x86/kernel/acpi/sleep.c

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index fddc2025dece..10d03d7931c4 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -43,7 +43,7 @@ static int xen_suspend(void *data)
         if (err) {
                 printk(KERN_ERR "xen_suspend: sysdev_suspend failed: %d\n",
                         err);
-                device_power_up(PMSG_RESUME);
+                dpm_resume_noirq(PMSG_RESUME);
                 return err;
         }
 
@@ -69,7 +69,7 @@ static int xen_suspend(void *data)
         }
 
         sysdev_resume();
-        device_power_up(PMSG_RESUME);
+        dpm_resume_noirq(PMSG_RESUME);
 
         return 0;
 }
@@ -92,18 +92,18 @@ static void do_suspend(void)
         }
 #endif
 
-        err = device_suspend(PMSG_SUSPEND);
+        err = dpm_suspend_start(PMSG_SUSPEND);
         if (err) {
-                printk(KERN_ERR "xen suspend: device_suspend %d\n", err);
+                printk(KERN_ERR "xen suspend: dpm_suspend_start %d\n", err);
                 goto out;
         }
 
         printk(KERN_DEBUG "suspending xenstore...\n");
         xs_suspend();
 
-        err = device_power_down(PMSG_SUSPEND);
+        err = dpm_suspend_noirq(PMSG_SUSPEND);
         if (err) {
-                printk(KERN_ERR "device_power_down failed: %d\n", err);
+                printk(KERN_ERR "dpm_suspend_noirq failed: %d\n", err);
                 goto resume_devices;
         }
 
@@ -119,10 +119,10 @@ static void do_suspend(void)
         } else
                 xs_suspend_cancel();
 
-        device_power_up(PMSG_RESUME);
+        dpm_resume_noirq(PMSG_RESUME);
 
 resume_devices:
-        device_resume(PMSG_RESUME);
+        dpm_resume_end(PMSG_RESUME);
 
         /* Make sure timer events get retriggered on all CPUs */
         clock_was_set();