From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Uytterhoeven Subject: [PATCH 2/6] ARM: davinci: Use generic runtime and clock helpers Date: Thu, 24 Apr 2014 12:26:34 +0200 Message-ID: <1398335198-26555-3-git-send-email-geert+renesas@glider.be> References: <1398335198-26555-1-git-send-email-geert+renesas@glider.be> Return-path: In-Reply-To: <1398335198-26555-1-git-send-email-geert+renesas@glider.be> Sender: linux-omap-owner@vger.kernel.org To: "Rafael J. Wysocki" , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ben Dooks , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-sh@vger.kernel.org, devicetree@vger.kernel.org, Geert Uytterhoeven List-Id: devicetree@vger.kernel.org Signed-off-by: Geert Uytterhoeven --- arch/arm/mach-davinci/pm_domain.c | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/arch/arm/mach-davinci/pm_domain.c b/arch/arm/mach-davinci/pm_domain.c index 6b98413cebd6..eb2eb126fdc0 100644 --- a/arch/arm/mach-davinci/pm_domain.c +++ b/arch/arm/mach-davinci/pm_domain.c @@ -10,43 +10,13 @@ * warranty of any kind, whether express or implied. */ #include -#include #include #include -#ifdef CONFIG_PM_RUNTIME -static int davinci_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 davinci_pm_runtime_resume(struct device *dev) -{ - dev_dbg(dev, "%s\n", __func__); - - pm_clk_resume(dev); - return pm_generic_runtime_resume(dev); -} -#endif - static struct dev_pm_domain davinci_pm_domain = { .ops = { - SET_RUNTIME_PM_OPS(davinci_pm_runtime_suspend, - davinci_pm_runtime_resume, NULL) + SET_RUNTIME_PM_OPS(pm_generic_runtime_clk_suspend, + pm_generic_clk_runtime_resume, NULL) USE_PLATFORM_PM_SLEEP_OPS }, }; -- 1.7.9.5