[PATCH/RFC v2 05/12] PM / Domains: Add helper variable np = dev->of_node
From: geert+renesas@glider.be (Geert Uytterhoeven)
Date: 2014-09-16 18:51:45
Also in:
linux-devicetree, linux-pm, linux-sh, lkml
Subsystem:
driver core, kobjects, debugfs and sysfs, hibernation (aka software suspend, aka swsusp), power management core, suspend to ram, the rest · Maintainers:
Greg Kroah-Hartman, "Rafael J. Wysocki", Danilo Krummrich, Linus Torvalds
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- 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 3fa15b6c54f09b36..e1cbde985d4de606 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c@@ -2130,17 +2130,18 @@ static struct generic_pm_domain *of_genpd_get_from_provider( */ 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)
@@ -2151,8 +2152,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; }
@@ -2161,7 +2161,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); }
@@ -2177,7 +2177,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