xen: use device model for suspending xenbus devices

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index b703dd2c9f11..5269bb4d2496 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -104,9 +104,8 @@ static void do_suspend(void)
                 goto out;
         }
 
-        printk("suspending xenbus...\n");
-        /* XXX use normal device tree? */
-        xenbus_suspend();
+        printk(KERN_DEBUG "suspending xenstore...\n");
+        xs_suspend();
 
         err = stop_machine(xen_suspend, &cancelled, cpumask_of(0));
         if (err) {
@@ -116,9 +115,9 @@ static void do_suspend(void)
 
         if (!cancelled) {
                 xen_arch_resume();
-                xenbus_resume();
+                xs_resume();
         } else
-                xenbus_suspend_cancel();
+                xs_suspend_cancel();
 
         device_resume(PMSG_RESUME);