Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap1 / pm_bus.c

diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
index c40e209de65c0fe6816a4dc31bc737335d8b71ca..667c1637ff9198b5aa539c10b6ae83352ad3afda 100644 (file)
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/arch/arm/mach-omap1/pm_bus.c
@@ -21,48 +21,15 @@
 
 #include "soc.h"
 
-#ifdef CONFIG_PM
-static int omap1_pm_runtime_suspend(struct device *dev)
-{
-       int ret;
-
-       dev_dbg(dev, "%s\n", __func__);
-
-       ret = pm_generic_runtime_suspend(dev);
-       if (ret)
-               return ret;
-
-       ret = pm_clk_suspend(dev);
-       if (ret) {
-               pm_generic_runtime_resume(dev);
-               return ret;
-       }
-
-       return 0;
-}
-
-static int omap1_pm_runtime_resume(struct device *dev)
-{
-       dev_dbg(dev, "%s\n", __func__);
-
-       pm_clk_resume(dev);
-       return pm_generic_runtime_resume(dev);
-}
-
 static struct dev_pm_domain default_pm_domain = {
        .ops = {
-               .runtime_suspend = omap1_pm_runtime_suspend,
-               .runtime_resume = omap1_pm_runtime_resume,
+               USE_PM_CLK_RUNTIME_OPS
                USE_PLATFORM_PM_SLEEP_OPS
        },
 };
-#define OMAP1_PM_DOMAIN (&default_pm_domain)
-#else
-#define OMAP1_PM_DOMAIN NULL
-#endif /* CONFIG_PM */
 
 static struct pm_clk_notifier_block platform_bus_notifier = {
-       .pm_domain = OMAP1_PM_DOMAIN,
+       .pm_domain = &default_pm_domain,
        .con_ids = { "ick", "fck", NULL, },
 };