Skip to contentSkip to conversation

clk: sprd: Hold reference returned by of_get_parent()

PATCH Applied Liang He 3 participants 4 messages Jul 4, 2022 – Aug 19, 2022

Subsystems (2)
lore
Share & tools
lore

Liang He

author
#0 lore raw

PATCH v5 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_put() for refcount balance.

Fixes f95e8c7923d1 ("clk: sprd: support to get regmap from parent node")

---
changelog:

v5: fix bug reported by Chunyan and confirmed by Orson
v4: fix another bug in the same place, missing in v3
v3: (1) keep original 'if-else if-else' coding style adviesd by Orson

     (2) fix typo in commit-log: of_node_out --> of_node_put

v2: minimize the effective range of of_get_parent() advised by Orson
v1: hold reference returned by of_get_parent()

 drivers/clk/sprd/common.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/clk/sprd/common.c +5 -4
index d620bbbcdfc8..24db1df09075 100644
@@ -41,7 +41,7 @@ int sprd_clk_regmap_init(struct platform_device *pdev,
 {
 	void __iomem *base;
 	struct device *dev = &pdev->dev;
-	struct device_node *node = dev->of_node;
+	struct device_node *node = dev->of_node, *np;
 	struct regmap *regmap;
 
 	if (of_find_property(node, "sprd,syscon", NULL)) {
@@ -50,9 +50,10 @@ 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));
+	} else if (of_device_is_compatible(np =	of_get_parent(node), "syscon")
+		|| (of_node_put(np), 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);
Signature · 1 line
2.25.1
maintainer Reviewed-by on v5 1/1
#1 lore raw

Liang,

Quoted 6 lines · Liang He

We should hold the reference returned by of_get_parent() and use it to call of_node_put() for refcount balance.

Fixes f95e8c7923d1 ("clk: sprd: support to get regmap from parent node")

Great job.
Thanks.

-Orson

Quoted 44 lines

---
changelog:

v5: fix bug reported by Chunyan and confirmed by Orson
v4: fix another bug in the same place, missing in v3
v3: (1) keep original 'if-else if-else' coding style adviesd by Orson

     (2) fix typo in commit-log: of_node_out --> of_node_put

v2: minimize the effective range of of_get_parent() advised by Orson
v1: hold reference returned by of_get_parent()

 drivers/clk/sprd/common.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/clk/sprd/common.c +5 -5
index d620bbbcdfc8..24db1df09075 100644
@@ -41,7 +41,7 @@ int sprd_clk_regmap_init(struct platform_device *pdev,
 {
        void __iomem *base;
        struct device *dev = &pdev->dev;
-       struct device_node *node = dev->of_node;
+       struct device_node *node = dev->of_node, *np;
        struct regmap *regmap;
 
        if (of_find_property(node, "sprd,syscon", NULL)) {
@@ -50,9 +50,10 @@ 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));
+       } else if (of_device_is_compatible(np = of_get_parent(node), "syscon")
+               || (of_node_put(np), 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);
--

2.25.1

maintainer
#2 lore raw
In reply to Liang He

Quoting Liang He (2022-07-03 17:47:29)

Quoted 33 lines

We should hold the reference returned by of_get_parent() and use it to call of_node_put() for refcount balance.

Fixes f95e8c7923d1 ("clk: sprd: support to get regmap from parent node")

---
changelog:

v5: fix bug reported by Chunyan and confirmed by Orson
v4: fix another bug in the same place, missing in v3
v3: (1) keep original 'if-else if-else' coding style adviesd by Orson

     (2) fix typo in commit-log: of_node_out --> of_node_put

v2: minimize the effective range of of_get_parent() advised by Orson
v1: hold reference returned by of_get_parent()

 drivers/clk/sprd/common.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/clk/sprd/common.c +1 -1
index d620bbbcdfc8..24db1df09075 100644
@@ -41,7 +41,7 @@ int sprd_clk_regmap_init(struct platform_device *pdev,
 {
        void __iomem *base;
        struct device *dev = &pdev->dev;
-       struct device_node *node = dev->of_node;
+       struct device_node *node = dev->of_node, *np;
        struct regmap *regmap;
 
        if (of_find_property(node, "sprd,syscon", NULL)) {

drivers/clk/sprd/common.c int sprd_clk_regmap_init(struct platform_device *pdev, · line 54

Quoted 8 lines
drivers/clk/sprd/common.c +2 -3
@@ -50,9 +50,10 @@ 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));
+       } else if (of_device_is_compatible(np = of_get_parent(node), "syscon")
+               || (of_node_put(np), 0)) {

This is gross.

maintainer Applied
#3 lore raw
In reply to Liang He

Quoting Liang He (2022-07-03 17:47:29)

Quoted 6 lines

We should hold the reference returned by of_get_parent() and use it to call of_node_put() for refcount balance.

Fixes f95e8c7923d1 ("clk: sprd: support to get regmap from parent node")

---

Applied to clk-next