summaryrefslogtreecommitdiff
path: root/drivers/xen
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-05-15 02:53:26 +0400
committerRafael J. Wysocki <rjw@sisk.pl>2009-06-12 23:32:31 +0400
commite39a71ef80877f4e30d808af9acceec80f4d2f7c (patch)
treee9d4ff1618328cf3a3fafee04621b9776ca169de /drivers/xen
parent1380a37e3da5d9e14ea5c2a4c6ab2b307a2798ea (diff)
downloadlinux-e39a71ef80877f4e30d808af9acceec80f4d2f7c.tar.xz
PM: Rename device_power_down/up()
Rename the functions performing "_noirq" dev_pm_ops operations from device_power_down() and device_power_up() to device_suspend_noirq() and device_resume_noirq(). The new function names are chosen to show that the functions are responsible for calling the _noirq() versions to finalize the suspend/resume operation. The current function names do not perform power down/up anymore so the names may be misleading. Global function renames: - device_power_down() -> device_suspend_noirq() - device_power_up() -> device_resume_noirq() Static function renames: - suspend_device_noirq() -> __device_suspend_noirq() - resume_device_noirq() -> __device_resume_noirq() Signed-off-by: Magnus Damm <damm@igel.co.jp> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Acked-by: Len Brown <lenb@kernel.org> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/manage.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index fddc2025dece..d5b327ac4039 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);
+ device_resume_noirq(PMSG_RESUME);
return err;
}
@@ -69,7 +69,7 @@ static int xen_suspend(void *data)
}
sysdev_resume();
- device_power_up(PMSG_RESUME);
+ device_resume_noirq(PMSG_RESUME);
return 0;
}
@@ -101,9 +101,9 @@ static void do_suspend(void)
printk(KERN_DEBUG "suspending xenstore...\n");
xs_suspend();
- err = device_power_down(PMSG_SUSPEND);
+ err = device_suspend_noirq(PMSG_SUSPEND);
if (err) {
- printk(KERN_ERR "device_power_down failed: %d\n", err);
+ printk(KERN_ERR "device_suspend_noirq failed: %d\n", err);
goto resume_devices;
}
@@ -119,7 +119,7 @@ static void do_suspend(void)
} else
xs_suspend_cancel();
- device_power_up(PMSG_RESUME);
+ device_resume_noirq(PMSG_RESUME);
resume_devices:
device_resume(PMSG_RESUME);