1 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
index 334fb8871bc3..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,24 +45,24 @@ 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);
 }
 
-static struct dev_power_domain default_power_domain = {
+static struct dev_pm_domain default_pm_domain = {
         .ops = {
                 .runtime_suspend = omap1_pm_runtime_suspend,
                 .runtime_resume = omap1_pm_runtime_resume,
                 USE_PLATFORM_PM_SLEEP_OPS
         },
 };
-#define OMAP1_PWR_DOMAIN (&default_power_domain)
+#define OMAP1_PM_DOMAIN (&default_pm_domain)
 #else
-#define OMAP1_PWR_DOMAIN NULL
+#define OMAP1_PM_DOMAIN NULL
 #endif /* CONFIG_PM_RUNTIME */
 
 static struct pm_clk_notifier_block platform_bus_notifier = {
-        .pwr_domain = OMAP1_PWR_DOMAIN,
+        .pm_domain = OMAP1_PM_DOMAIN,
         .con_ids = { "ick", "fck", NULL, },
 };
 
@@ -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;
 }