Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> --- This depends on "of/clk: Register clocks suitable for Runtime PM with the PM core" --- drivers/of/of_clk.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/drivers/of/of_clk.c b/drivers/of/of_clk.c index 35f5e9f3dd42..3e8561dce998 100644 --- a/drivers/of/of_clk.c +++ b/drivers/of/of_clk.c @@ -8,38 +8,14 @@ #include <linux/of_clk.h> #include <linux/platform_device.h> #include <linux/pm_clock.h> -#include <linux/pm_runtime.h> #ifdef CONFIG_PM_RUNTIME -static int of_clk_pm_runtime_suspend(struct device *dev) -{ - int ret; - - 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 of_clk_pm_runtime_resume(struct device *dev) -{ - pm_clk_resume(dev); - return pm_generic_runtime_resume(dev); -} - static struct dev_pm_domain of_clk_pm_domain = { .ops = { - .runtime_suspend = of_clk_pm_runtime_suspend, - .runtime_resume = of_clk_pm_runtime_resume, + .runtime_suspend = pm_generic_runtime_clk_suspend, + .runtime_resume = pm_generic_clk_runtime_resume, USE_PLATFORM_PM_SLEEP_OPS }, }; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html