From: Geert Uytterhoeven <geert+renesas@glider.be>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Kevin Hilman <khilman@kernel.org>,
Ulf Hansson <ulf.hansson@linaro.org>,
Axel Haslam <ahaslam@baylibre.com>
Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH/RFC v6 5/7] PM / Domains: Add helper variable np = dev->of_node
Date: Mon, 27 Apr 2015 14:43:40 +0200 [thread overview]
Message-ID: <1430138622-14029-6-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1430138622-14029-1-git-send-email-geert+renesas@glider.be>
Just a cleanup, no functional changes.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Kevin Hilman <khilman@linaro.org>
---
v6:
- Rebased on top of v4.1-rc1 for new RFC,
v4:
- Add more explanations,
- Add Acked-by,
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 d1531602ae64528d..d20caa2c92b57edf 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2190,17 +2190,18 @@ static void genpd_dev_pm_sync(struct device *dev)
*/
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)
@@ -2211,8 +2212,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;
}
@@ -2221,7 +2221,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);
}
@@ -2237,7 +2237,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:[~2015-04-27 12:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-27 12:43 [PATCH/RFC v6 0/7] PM / Domains: DT power-on/off and QoS device latencies Geert Uytterhoeven
2015-04-27 12:43 ` [PATCH/RFC v6 1/7] PM / Domains: Add DT bindings for power-on/off latencies Geert Uytterhoeven
2015-04-27 12:43 ` [PATCH/RFC v6 2/7] PM / Domains: R-Mobile SYSC: Add PM domain " Geert Uytterhoeven
2015-04-27 12:43 ` [PATCH/RFC v6 3/7] ARM: shmobile: R-Mobile: Add support for " Geert Uytterhoeven
2015-04-27 12:43 ` [PATCH/RFC v6 4/7] PM / Domains: Add DT bindings for PM QoS device latencies Geert Uytterhoeven
2015-05-13 8:36 ` Ulf Hansson
2015-04-27 12:43 ` Geert Uytterhoeven [this message]
2015-05-13 8:10 ` [PATCH/RFC v6 5/7] PM / Domains: Add helper variable np = dev->of_node Ulf Hansson
2015-04-27 12:43 ` [PATCH/RFC v6 6/7] PM / Domains: Retrieve PM QoS device latencies from DT Geert Uytterhoeven
[not found] ` <1430138622-14029-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
2015-04-27 12:43 ` [PATCH/RFC v6 7/7] PM / Domains: R-Mobile SYSC: Add PM QoS device latencies Geert Uytterhoeven
2015-05-13 8:44 ` [PATCH/RFC v6 0/7] PM / Domains: DT power-on/off and " 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=1430138622-14029-6-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=ahaslam@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=khilman@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--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).