From: Geert Uytterhoeven <geert+renesas@glider.be>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Simon Horman <horms@verge.net.au>,
Magnus Damm <magnus.damm@gmail.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>,
Tomasz Figa <tomasz.figa@gmail.com>,
Philipp Zabel <philipp.zabel@gmail.com>,
Grygorii Strashko <grygorii.strashko@ti.com>,
Kevin Hilman <khilman@linaro.org>,
linux-sh@vger.kernel.org, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH v3 05/13] PM / Domains: Add helper variable np = dev->of_node
Date: Thu, 25 Sep 2014 18:28:32 +0200 [thread overview]
Message-ID: <1411662520-22795-6-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1411662520-22795-1-git-send-email-geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v3:
- No changes
v2:
- New
drivers/base/power/domain.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 6e36bb09e7d9c144..0ebc6bb31c9c227f 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2171,17 +2171,18 @@ static void genpd_dev_pm_detach(struct device *dev, bool power_off)
*/
int genpd_dev_pm_attach(struct device *dev)
{
+ struct device_node *np = dev->of_node;
struct of_phandle_args pd_args;
struct generic_pm_domain *pd;
int ret;
- if (!dev->of_node)
+ if (!np)
return -ENODEV;
if (dev->pm_domain)
return -EEXIST;
- ret = of_parse_phandle_with_args(dev->of_node, "power-domains",
+ ret = of_parse_phandle_with_args(np, "power-domains",
"#power-domain-cells", 0, &pd_args);
if (ret < 0) {
if (ret != -ENOENT)
@@ -2192,8 +2193,7 @@ int genpd_dev_pm_attach(struct device *dev)
* (for backwards compatibility of DT ABI)
*/
pd_args.args_count = 0;
- pd_args.np = of_parse_phandle(dev->of_node,
- "samsung,power-domain", 0);
+ pd_args.np = of_parse_phandle(np, "samsung,power-domain", 0);
if (!pd_args.np)
return -ENOENT;
}
@@ -2202,7 +2202,7 @@ int genpd_dev_pm_attach(struct device *dev)
if (IS_ERR(pd)) {
dev_dbg(dev, "%s() failed to find PM domain: %ld\n",
__func__, PTR_ERR(pd));
- of_node_put(dev->of_node);
+ of_node_put(np);
return PTR_ERR(pd);
}
@@ -2218,7 +2218,7 @@ int genpd_dev_pm_attach(struct device *dev)
if (ret < 0) {
dev_err(dev, "failed to add to PM domain %s: %d",
pd->name, ret);
- of_node_put(dev->of_node);
+ of_node_put(np);
return ret;
}
--
1.9.1
next prev parent reply other threads:[~2014-09-25 16:28 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-25 16:28 [PATCH 00/13] ARM: shmobile: R-Mobile: DT PM domain support Geert Uytterhoeven
[not found] ` <1411662520-22795-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
2014-09-25 16:28 ` [PATCH v3 01/13] PM / Domains: Add genpd attach/detach callbacks Geert Uytterhoeven
2014-09-26 15:47 ` Kevin Hilman
2014-09-25 16:28 ` [PATCH v3 02/13] PM / Domains: Add DT bindings for power-on/off latencies Geert Uytterhoeven
2014-09-26 8:19 ` Ulf Hansson
2014-09-26 15:28 ` Stephen Boyd
2014-09-26 17:52 ` Geert Uytterhoeven
2014-09-25 16:28 ` [PATCH v3 03/13] PM / Domains: Add DT bindings for PM QoS device latencies Geert Uytterhoeven
2014-09-26 8:28 ` Ulf Hansson
2014-09-25 16:28 ` [PATCH v3 04/13] PM / Domains: Add DT bindings for the R-Mobile System Controller Geert Uytterhoeven
2014-09-26 8:32 ` Ulf Hansson
2014-09-25 16:28 ` Geert Uytterhoeven [this message]
2014-09-26 8:43 ` [PATCH v3 05/13] PM / Domains: Add helper variable np = dev->of_node Ulf Hansson
2014-09-26 8:47 ` Geert Uytterhoeven
2014-09-25 16:28 ` [PATCH v3 06/13] PM / Domains: Retrieve PM QoS device latencies from DT Geert Uytterhoeven
2014-09-25 16:28 ` [PATCH v3 07/13] ARM: shmobile: R-Mobile: Use generic_pm_domain.attach_dev() for pm_clk setup Geert Uytterhoeven
2014-09-26 8:45 ` Ulf Hansson
[not found] ` <1411662520-22795-8-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
2014-09-26 18:04 ` Geert Uytterhoeven
2014-10-03 16:01 ` Geert Uytterhoeven
2014-09-25 16:28 ` [PATCH v3 08/13] ARM: shmobile: R-Mobile: Store SYSC base address in rmobile_pm_domain Geert Uytterhoeven
2014-09-26 8:47 ` Ulf Hansson
2014-09-25 16:28 ` [PATCH v3 09/13] ARM: shmobile: R-Mobile: Add DT support for PM domains Geert Uytterhoeven
2014-09-25 16:28 ` [PATCH v3 10/13] ARM: shmobile: r8a7740 dtsi: Add PM domain support Geert Uytterhoeven
2014-09-26 8:13 ` Geert Uytterhoeven
2014-09-25 16:28 ` [PATCH v3 11/13] drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd Geert Uytterhoeven
2014-09-25 16:28 ` [PATCH v3 12/13] ARM: shmobile: r8a7740 dtsi: Add preliminary PM domain latencies Geert Uytterhoeven
2014-09-25 16:28 ` [PATCH v3 13/13] ARM: shmobile: r8a7740 dtsi: Add preliminary PM QoS device latencies Geert Uytterhoeven
2014-09-26 8:16 ` Geert Uytterhoeven
2014-09-25 20:19 ` [PATCH 00/13] ARM: shmobile: R-Mobile: DT PM domain support Rafael J. Wysocki
[not found] ` <3136347.ncZoJtR6MK-sKB8Sp2ER+y1GS7QM15AGw@public.gmane.org>
2014-09-26 9:27 ` Geert Uytterhoeven
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=1411662520-22795-6-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=devicetree@vger.kernel.org \
--cc=grygorii.strashko@ti.com \
--cc=horms@verge.net.au \
--cc=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=philipp.zabel@gmail.com \
--cc=rjw@rjwysocki.net \
--cc=tomasz.figa@gmail.com \
--cc=ulf.hansson@linaro.org \
/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).