clk: sprd: Hold reference returned by of_get_parent()
Subsystems (2)
PATCH v2 1/1 clk: sprd: Hold reference returned by of_get_parent()
We should hold the reference returned by of_get_parent() and use it to call of_node_out() for refcount balance.
---
changelog:
v2: minimize the effective range of of_get_parent() advised by Orson
v1: hold reference returned by of_get_parent()
v1-link: https://lore.kernel.org/all/[email protected]/
Patched file has been compiled test in 5.19rc2.
drivers/clk/sprd/common.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)
drivers/clk/sprd/common.c +21 -16
@@ -50,23 +50,28 @@ int sprd_clk_regmap_init(struct platform_device *pdev,pr_err ("%s: failed to get syscon regmap\n" , __func__);return PTR_ERR (regmap); } - }else if (of_device_is_compatible (of_get_parent (dev->of_node), -"syscon" )) { - regmap =device_node_to_regmap (of_get_parent (dev->of_node)); -if (IS_ERR (regmap)) { -dev_err (dev,"failed to get regmap from its parent.\n" ); -return PTR_ERR (regmap); - } }else { - base =devm_platform_ioremap_resource (pdev,0 ); -if (IS_ERR (base)) -return PTR_ERR (base); - - regmap =devm_regmap_init_mmio (&pdev->dev, base, - &sprdclk_regmap_config); -if (IS_ERR (regmap)) { -pr_err ("failed to init regmap\n" ); -return PTR_ERR (regmap); +struct device_node *np =of_get_parent (dev->of_node); + +if (of_device_is_compatible (np,"syscon" )) { + regmap =device_node_to_regmap (np); +of_node_put (np); +if (IS_ERR (regmap)) { +dev_err (dev,"failed to get regmap from its parent.\n" ); +return PTR_ERR (regmap); + } + }else { +of_node_put (np); + base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (base)) +return PTR_ERR (base); + + regmap =devm_regmap_init_mmio (&pdev->dev, base, + &sprdclk_regmap_config); +if (IS_ERR (regmap)) { +pr_err ("failed to init regmap\n" ); +return PTR_ERR (regmap); + } } }
Signature · 1 line
2.25.1
Orson Zhai
maintainerHi Liang,
Quoted 3 lines · Liang He
We should hold the reference returned by
of_get_parent()and use it to callof_node_out()for refcount balance.
typo. s/out/put
Quoted 33 lines
Fixes f95e8c7923d1 ("clk: sprd: support to get regmap from parent node")Signed-off-by Liang He <[email protected]>---
changelog:v2: minimize the effective range of
of_get_parent()advised by Orson
v1: hold reference returned byof_get_parent()v1-link: https://lore.kernel.org/all/[email protected]/
Patched file has been compiled test in 5.19rc2.
drivers/clk/sprd/common.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)drivers/clk/sprd/common.c +0
-7@@ -50,23 +50,28 @@ int sprd_clk_regmap_init(struct platform_device *pdev,pr_err ("%s: failed to get syscon regmap\n" , __func__);return PTR_ERR (regmap); } - }else if (of_device_is_compatible (of_get_parent (dev->of_node), -"syscon" )) { - regmap =device_node_to_regmap (of_get_parent (dev->of_node)); -if (IS_ERR (regmap)) { -dev_err (dev,"failed to get regmap from its parent.\n" ); -return PTR_ERR (regmap); - } }else {
drivers/clk/sprd/common.c int sprd_clk_regmap_init(struct platform_device *pdev, · line 54
Quoted 10 lines
drivers/clk/sprd/common.c +1
-9- base =devm_platform_ioremap_resource (pdev,0 ); -if (IS_ERR (base)) -return PTR_ERR (base); - - regmap =devm_regmap_init_mmio (&pdev->dev, base, - &sprdclk_regmap_config); -if (IS_ERR (regmap)) { -pr_err ("failed to init regmap\n" ); -return PTR_ERR (regmap); +struct device_node *np =of_get_parent (dev->of_node);
move the declaration of "np" to the beginning part without assigning any value.
drivers/clk/sprd/common.c int sprd_clk_regmap_init(struct platform_device *pdev, · line 56
Quoted 2 lines
drivers/clk/sprd/common.c +2
-0+ +if (of_device_is_compatible (np,"syscon" )) {
There may be no need to split the origin structure of "if...else if...else". How about the following method?
else if (of_device_is_compatible(np =of_get_parent(dev->of_node), "syscon")
|| (of_node_put(np), 0)) {drivers/clk/sprd/common.c int sprd_clk_regmap_init(struct platform_device *pdev, · line 64
Quoted 8 lines
drivers/clk/sprd/common.c +8
-0+ regmap =device_node_to_regmap (np); +of_node_put (np); +if (IS_ERR (regmap)) { +dev_err (dev,"failed to get regmap from its parent.\n" ); +return PTR_ERR (regmap); + } + }else { +of_node_put (np);
This line would not be necessary then.
-Orson
Quoted 16 lines
drivers/clk/sprd/common.c +10
-1+ base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (base)) +return PTR_ERR (base); + + regmap =devm_regmap_init_mmio (&pdev->dev, base, + &sprdclk_regmap_config); +if (IS_ERR (regmap)) { +pr_err ("failed to init regmap\n" ); +return PTR_ERR (regmap); + } } } --2.25.1
Quoted 9 lines · Orson Zhai
Hi Liang,
Quoted 3 lines · Liang He
We should hold the reference returned by
of_get_parent()and use it to callof_node_out()for refcount balance.typo. s/out/put
Thanks, I will correct it in next version.
Quoted 37 lines
Quoted 37 lines
Fixes f95e8c7923d1 ("clk: sprd: support to get regmap from parent node")Signed-off-by Liang He <[email protected]>---
changelog:v2: minimize the effective range of
of_get_parent()advised by Orson
v1: hold reference returned byof_get_parent()v1-link: https://lore.kernel.org/all/[email protected]/
Patched file has been compiled test in 5.19rc2.
drivers/clk/sprd/common.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)drivers/clk/sprd/common.c +0
-11@@ -50,23 +50,28 @@ int sprd_clk_regmap_init(struct platform_device *pdev,pr_err ("%s: failed to get syscon regmap\n" , __func__);return PTR_ERR (regmap); } - }else if (of_device_is_compatible (of_get_parent (dev->of_node), -"syscon" )) { - regmap =device_node_to_regmap (of_get_parent (dev->of_node)); -if (IS_ERR (regmap)) { -dev_err (dev,"failed to get regmap from its parent.\n" ); -return PTR_ERR (regmap); - } }else { - base =devm_platform_ioremap_resource (pdev,0 ); -if (IS_ERR (base)) -return PTR_ERR (base); -
Quoted 9 lines
drivers/clk/sprd/common.c int sprd_clk_regmap_init(struct platform_device *pdev, · line 54
Quoted 6 lines
drivers/clk/sprd/common.c +1
-5- regmap =devm_regmap_init_mmio (&pdev->dev, base, - &sprdclk_regmap_config); -if (IS_ERR (regmap)) { -pr_err ("failed to init regmap\n" ); -return PTR_ERR (regmap); +struct device_node *np =of_get_parent (dev->of_node);move the declaration of "np" to the beginning part without assigning any value.
OK.
Quoted 10 lines
drivers/clk/sprd/common.c int sprd_clk_regmap_init(struct platform_device *pdev, · line 56
Quoted 2 lines
drivers/clk/sprd/common.c +2
-0+ +if (of_device_is_compatible (np,"syscon" )) {There may be no need to split the origin structure of "if...else if...else". How about the following method?
else if (of_device_is_compatible(np =
of_get_parent(dev->of_node), "syscon")|| (of_node_put(np), 0)) {
Thanks, I will try it and compile test it before I send next version.
Quoted 9 lines
drivers/clk/sprd/common.c int sprd_clk_regmap_init(struct platform_device *pdev, · line 64
Quoted 8 lines
drivers/clk/sprd/common.c +8
-0+ regmap =device_node_to_regmap (np); +of_node_put (np); +if (IS_ERR (regmap)) { +dev_err (dev,"failed to get regmap from its parent.\n" ); +return PTR_ERR (regmap); + } + }else { +of_node_put (np);
Quoted 3 lines
This line would not be necessary then.
-Orson
Thanks, I will remove this line.
Liang
Quoted 17 lines
Quoted 17 lines
drivers/clk/sprd/common.c +10
-1+ base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (base)) +return PTR_ERR (base); + + regmap =devm_regmap_init_mmio (&pdev->dev, base, + &sprdclk_regmap_config); +if (IS_ERR (regmap)) { +pr_err ("failed to init regmap\n" ); +return PTR_ERR (regmap); + } } } --2.25.1