From: Geert Uytterhoeven <geert+renesas@glider.be>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ben Dooks <ben.dooks@codethink.co.uk>,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
linux-sh@vger.kernel.org, devicetree@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH 6/6] of/clk: Use generic runtime and clock helpers
Date: Thu, 24 Apr 2014 12:26:38 +0200 [thread overview]
Message-ID: <1398335198-26555-7-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1398335198-26555-1-git-send-email-geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
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
next prev parent reply other threads:[~2014-04-24 10:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-24 10:26 [PATCH 0/6] PM / clock_ops: Add helpers combining generic runtime and generic clock PM Geert Uytterhoeven
2014-04-24 10:26 ` [PATCH 1/6] " Geert Uytterhoeven
2014-04-24 11:16 ` Sergei Shtylyov
2014-04-24 10:26 ` [PATCH 2/6] ARM: davinci: Use generic runtime and clock helpers Geert Uytterhoeven
2014-04-24 10:26 ` [PATCH 3/6] ARM: keystone: " Geert Uytterhoeven
2014-04-24 10:26 ` [PATCH 4/6] ARM: omap: " Geert Uytterhoeven
2014-04-24 10:26 ` [PATCH 5/6] drivers: sh: " Geert Uytterhoeven
2014-04-24 10:26 ` Geert Uytterhoeven [this message]
2014-04-24 13:26 ` [PATCH 0/6] PM / clock_ops: Add helpers combining generic runtime and generic clock PM Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398335198-26555-7-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=ben.dooks@codethink.co.uk \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).