| Message ID | 1411662520-22795-6-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 25 September 2014 18:28, Geert Uytterhoeven <geert+renesas@glider.be> wrote: Why? > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Normally I think this kind of cleanup patches is a bit unnecessary, but I don't have strong opinions. Kind regards Uffe > --- > 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Sep 26, 2014 at 10:43 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote: > On 25 September 2014 18:28, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > > Why? Because else the next patch would add a few more users of dev->of_node. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }
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(-)