| Message ID | 20220726073841.1320509-1-windhl@126.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] soc: amlogic: meson-pwrc: Hold reference returned by of_get_parent() | expand |
On Tue, Jul 26, 2022 at 9:39 AM Liang He <windhl@126.com> wrote: > > We should hold the reference returned by of_get_parent() and use > it to call of_node_put() for refcount balance. > > Signed-off-by: Liang He <windhl@126.com> Thank you for the update in v2! This now gets my: Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
On 26/07/2022 09:38, Liang He wrote: > We should hold the reference returned by of_get_parent() and use > it to call of_node_put() for refcount balance. > > Signed-off-by: Liang He <windhl@126.com> > --- > drivers/soc/amlogic/meson-ee-pwrc.c | 5 ++++- > drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 5 ++++- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/soc/amlogic/meson-ee-pwrc.c b/drivers/soc/amlogic/meson-ee-pwrc.c > index 2be3afe6c2e3..dd5f2a13ceb5 100644 > --- a/drivers/soc/amlogic/meson-ee-pwrc.c > +++ b/drivers/soc/amlogic/meson-ee-pwrc.c > @@ -469,6 +469,7 @@ static int meson_ee_pwrc_probe(struct platform_device *pdev) > { > const struct meson_ee_pwrc_domain_data *match; > struct regmap *regmap_ao, *regmap_hhi; > + struct device_node *parent_np; > struct meson_ee_pwrc *pwrc; > int i, ret; > > @@ -495,7 +496,9 @@ static int meson_ee_pwrc_probe(struct platform_device *pdev) > > pwrc->xlate.num_domains = match->count; > > - regmap_hhi = syscon_node_to_regmap(of_get_parent(pdev->dev.of_node)); > + parent_np = of_get_parent(pdev->dev.of_node); > + regmap_hhi = syscon_node_to_regmap(parent_np); > + of_node_put(parent_np); > if (IS_ERR(regmap_hhi)) { > dev_err(&pdev->dev, "failed to get HHI regmap\n"); > return PTR_ERR(regmap_hhi); > diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c > index b4615b288625..312fd9afccb0 100644 > --- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c > +++ b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c > @@ -273,6 +273,7 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev) > const struct meson_gx_pwrc_vpu *vpu_pd_match; > struct regmap *regmap_ao, *regmap_hhi; > struct meson_gx_pwrc_vpu *vpu_pd; > + struct device_node *parent_np; > struct reset_control *rstc; > struct clk *vpu_clk; > struct clk *vapb_clk; > @@ -291,7 +292,9 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev) > > memcpy(vpu_pd, vpu_pd_match, sizeof(*vpu_pd)); > > - regmap_ao = syscon_node_to_regmap(of_get_parent(pdev->dev.of_node)); > + parent_np = of_get_parent(pdev->dev.of_node); > + regmap_ao = syscon_node_to_regmap(parent_np); > + of_node_put(parent_np); > if (IS_ERR(regmap_ao)) { > dev_err(&pdev->dev, "failed to get regmap\n"); > return PTR_ERR(regmap_ao); Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
On Tue 26 Jul 2022 at 15:38, Liang He <windhl@126.com> wrote: > We should hold the reference returned by of_get_parent() and use > it to call of_node_put() for refcount balance. Considering you are making this type of changes more or less everywhere in the tree it would be good to propose an helper function instead of repeating the of_get_parent(), syscon_node_to_regmap(), of_node_put() pattern. A coccinelle script would be nice too. Thx > > Signed-off-by: Liang He <windhl@126.com> > --- > drivers/soc/amlogic/meson-ee-pwrc.c | 5 ++++- > drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 5 ++++- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/soc/amlogic/meson-ee-pwrc.c b/drivers/soc/amlogic/meson-ee-pwrc.c > index 2be3afe6c2e3..dd5f2a13ceb5 100644 > --- a/drivers/soc/amlogic/meson-ee-pwrc.c > +++ b/drivers/soc/amlogic/meson-ee-pwrc.c > @@ -469,6 +469,7 @@ static int meson_ee_pwrc_probe(struct platform_device *pdev) > { > const struct meson_ee_pwrc_domain_data *match; > struct regmap *regmap_ao, *regmap_hhi; > + struct device_node *parent_np; > struct meson_ee_pwrc *pwrc; > int i, ret; > > @@ -495,7 +496,9 @@ static int meson_ee_pwrc_probe(struct platform_device *pdev) > > pwrc->xlate.num_domains = match->count; > > - regmap_hhi = syscon_node_to_regmap(of_get_parent(pdev->dev.of_node)); > + parent_np = of_get_parent(pdev->dev.of_node); > + regmap_hhi = syscon_node_to_regmap(parent_np); > + of_node_put(parent_np); > if (IS_ERR(regmap_hhi)) { > dev_err(&pdev->dev, "failed to get HHI regmap\n"); > return PTR_ERR(regmap_hhi); > diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c > index b4615b288625..312fd9afccb0 100644 > --- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c > +++ b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c > @@ -273,6 +273,7 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev) > const struct meson_gx_pwrc_vpu *vpu_pd_match; > struct regmap *regmap_ao, *regmap_hhi; > struct meson_gx_pwrc_vpu *vpu_pd; > + struct device_node *parent_np; > struct reset_control *rstc; > struct clk *vpu_clk; > struct clk *vapb_clk; > @@ -291,7 +292,9 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev) > > memcpy(vpu_pd, vpu_pd_match, sizeof(*vpu_pd)); > > - regmap_ao = syscon_node_to_regmap(of_get_parent(pdev->dev.of_node)); > + parent_np = of_get_parent(pdev->dev.of_node); > + regmap_ao = syscon_node_to_regmap(parent_np); > + of_node_put(parent_np); > if (IS_ERR(regmap_ao)) { > dev_err(&pdev->dev, "failed to get regmap\n"); > return PTR_ERR(regmap_ao);
Hi, On Tue, 26 Jul 2022 15:38:41 +0800, Liang He wrote: > We should hold the reference returned by of_get_parent() and use > it to call of_node_put() for refcount balance. > > Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.1/drivers) [1/1] soc: amlogic: meson-pwrc: Hold reference returned by of_get_parent() https://git.kernel.org/amlogic/c/9491cff16a4996aee578adf9f41acfb1bc483df9 These changes has been applied on the intermediate git tree [1]. The v6.1/drivers branch will then be sent via a formal Pull Request to the Linux SoC maintainers for inclusion in their intermediate git branches in order to be sent to Linus during the next merge window, or sooner if it's a set of fixes. In the cases of fixes, those will be merged in the current release candidate kernel and as soon they appear on the Linux master branch they will be backported to the previous Stable and Long-Stable kernels [2]. The intermediate git branches are merged daily in the linux-next tree [3], people are encouraged testing these pre-release kernels and report issues on the relevant mailing-lists. If problems are discovered on those changes, please submit a signed-off-by revert patch followed by a corrective changeset. [1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git [3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
diff --git a/drivers/soc/amlogic/meson-ee-pwrc.c b/drivers/soc/amlogic/meson-ee-pwrc.c index 2be3afe6c2e3..dd5f2a13ceb5 100644 --- a/drivers/soc/amlogic/meson-ee-pwrc.c +++ b/drivers/soc/amlogic/meson-ee-pwrc.c @@ -469,6 +469,7 @@ static int meson_ee_pwrc_probe(struct platform_device *pdev) { const struct meson_ee_pwrc_domain_data *match; struct regmap *regmap_ao, *regmap_hhi; + struct device_node *parent_np; struct meson_ee_pwrc *pwrc; int i, ret; @@ -495,7 +496,9 @@ static int meson_ee_pwrc_probe(struct platform_device *pdev) pwrc->xlate.num_domains = match->count; - regmap_hhi = syscon_node_to_regmap(of_get_parent(pdev->dev.of_node)); + parent_np = of_get_parent(pdev->dev.of_node); + regmap_hhi = syscon_node_to_regmap(parent_np); + of_node_put(parent_np); if (IS_ERR(regmap_hhi)) { dev_err(&pdev->dev, "failed to get HHI regmap\n"); return PTR_ERR(regmap_hhi); diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c index b4615b288625..312fd9afccb0 100644 --- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c +++ b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c @@ -273,6 +273,7 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev) const struct meson_gx_pwrc_vpu *vpu_pd_match; struct regmap *regmap_ao, *regmap_hhi; struct meson_gx_pwrc_vpu *vpu_pd; + struct device_node *parent_np; struct reset_control *rstc; struct clk *vpu_clk; struct clk *vapb_clk; @@ -291,7 +292,9 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev) memcpy(vpu_pd, vpu_pd_match, sizeof(*vpu_pd)); - regmap_ao = syscon_node_to_regmap(of_get_parent(pdev->dev.of_node)); + parent_np = of_get_parent(pdev->dev.of_node); + regmap_ao = syscon_node_to_regmap(parent_np); + of_node_put(parent_np); if (IS_ERR(regmap_ao)) { dev_err(&pdev->dev, "failed to get regmap\n"); return PTR_ERR(regmap_ao);
We should hold the reference returned by of_get_parent() and use it to call of_node_put() for refcount balance. Signed-off-by: Liang He <windhl@126.com> --- drivers/soc/amlogic/meson-ee-pwrc.c | 5 ++++- drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)