soc: amlogic: meson-pwrc: Hold reference returned by of_get_parent()
PATCH v2 1/1 soc: amlogic: meson-pwrc: Hold reference returned by of_get_parent()
We should hold the reference returned by of_get_parent() and use it to call of_node_put() for refcount balance.
--- drivers/soc/amlogic/meson-ee-pwrc.c | 5 ++++- drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/soc/amlogic/meson-ee-pwrc.c +4 -1
@@ -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);
drivers/soc/amlogic/meson-gx-pwrc-vpu.c +4 -1
@@ -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);
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 5 lines · Liang He
We should hold the reference returned by
of_get_parent()and use it to callof_node_put()for refcount balance.Signed-off-by Liang He <[email protected]>
Thank you for the update in v2! This now gets my:
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Quoted 45 lines · Liang He
We should hold the reference returned by
of_get_parent()and use it to callof_node_put()for refcount balance.Signed-off-by Liang He <[email protected]>--- drivers/soc/amlogic/meson-ee-pwrc.c | 5 ++++- drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)drivers/soc/amlogic/meson-ee-pwrc.c +4
-1@@ -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);drivers/soc/amlogic/meson-gx-pwrc-vpu.c +1
-0@@ -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;
drivers/soc/amlogic/meson-gx-pwrc-vpu.c static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev) · line 300
Quoted 10 lines
drivers/soc/amlogic/meson-gx-pwrc-vpu.c +3
-1@@ -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);
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Jerome Brunet
reviewerQuoted 2 lines · Liang He
We should hold the reference returned by
of_get_parent()and use it to callof_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
Quoted 43 lines
Signed-off-by Liang He <[email protected]>--- drivers/soc/amlogic/meson-ee-pwrc.c | 5 ++++- drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)drivers/soc/amlogic/meson-ee-pwrc.c +4
-1@@ -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);drivers/soc/amlogic/meson-gx-pwrc-vpu.c +1
-0@@ -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;
drivers/soc/amlogic/meson-gx-pwrc-vpu.c static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev) · line 300
Quoted 10 lines
drivers/soc/amlogic/meson-gx-pwrc-vpu.c +3
-1@@ -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);
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Neil Armstrong
AppliedHi,
Quoted 4 lines · Liang He
We should hold the reference returned by
of_get_parent()and use it to callof_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
Signature · 6 lines
Neil _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic