summary refs log tree commit diff
path: root/drivers/xen/manage.c
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2009-02-09 12:05:50 -0800
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-03-30 09:26:56 -0700
commitde5b31bd47de7e6f41be2e271318dbc8f1af354d (patch)
treed222e4ce03706e5047b78e060f85ed0b31727eaa /drivers/xen/manage.c
parenta1ce1be578365a4da7e7d7db4812539d2d5da763 (diff)
downloadlinux-de5b31bd47de7e6f41be2e271318dbc8f1af354d.tar.gz
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>
Diffstat (limited to 'drivers/xen/manage.c')
-rw-r--r--drivers/xen/manage.c9
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);