summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/pm_bus.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-07-01 22:13:44 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2011-07-02 14:29:57 +0200
commit3d5c30367cbc0c55c93bb158e824e00badc7ddc4 (patch)
tree073ab59dfbf0514e9ba5eb37431a337c5511af33 /arch/arm/mach-omap1/pm_bus.c
parentPM: Allow the clocks management code to be used during system suspend (diff)
downloadlinux-3d5c30367cbc0c55c93bb158e824e00badc7ddc4.tar.xz
linux-3d5c30367cbc0c55c93bb158e824e00badc7ddc4.zip
PM: Rename clock management functions
The common PM clock management functions may be used for system suspend/resume as well as for runtime PM, so rename them accordingly. Modify kerneldoc comments describing these functions and kernel messages printed by them, so that they refer to power management in general rather that to runtime PM. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Reviewed-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap1/pm_bus.c')
-rw-r--r--arch/arm/mach-omap1/pm_bus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
index 212f33103712..943072d5a1d5 100644
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/arch/arm/mach-omap1/pm_bus.c
@@ -32,7 +32,7 @@ static int omap1_pm_runtime_suspend(struct device *dev)
if (ret)
return ret;
- ret = pm_runtime_clk_suspend(dev);
+ ret = pm_clk_suspend(dev);
if (ret) {
pm_generic_runtime_resume(dev);
return ret;
@@ -45,7 +45,7 @@ static int omap1_pm_runtime_resume(struct device *dev)
{
dev_dbg(dev, "%s\n", __func__);
- pm_runtime_clk_resume(dev);
+ pm_clk_resume(dev);
return pm_generic_runtime_resume(dev);
}
@@ -71,7 +71,7 @@ static int __init omap1_pm_runtime_init(void)
if (!cpu_class_is_omap1())
return -ENODEV;
- pm_runtime_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
+ pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
return 0;
}