Skip to contentSkip to conversation

drivers: clk: Add missing of_node_put()

PATCH Superseded Liang He 2 participants 3 messages Jun 16, 2022 – Jun 17, 2022

Subsystems (4)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Liang He

author
#0 lore raw

PATCH v3 1/1 drivers: clk: Add missing of_node_put()

In these clk-related drivers' xxx_init() funcitons, of_find_matching_node() will return a node pointer with refcount incremented. We should use of_node_put() in fail path or when it is not used anymore.

---
changelog:

v3: merge clk 'missing of_node_put()' patches into one commit.
v2: use Liang He as real name for S-o-b.
v1: fix the missing of_node_put().

 drivers/clk/clk-nomadik.c        | 5 ++++-
 drivers/clk/tegra/clk-tegra124.c | 1 +
 drivers/clk/tegra/clk-tegra30.c  | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)
drivers/clk/clk-nomadik.c +4 -1
index bad2677e11ae..71fbe687fa7b 100644
@@ -99,7 +99,7 @@ static void __init nomadik_src_init(void)
 	if (!src_base) {
 		pr_err("%s: must have src parent node with REGS (%pOFn)\n",
 		       __func__, np);
-		return;
+		goto out_put;
 	}
 
 	/* Set all timers to use the 2.4 MHz TIMCLK */
@@ -132,6 +132,9 @@ static void __init nomadik_src_init(void)
 	}
 	writel(val, src_base + SRC_XTALCR);
 	register_reboot_notifier(&nomadik_clk_reboot_notifier);
+
+out_put:
+	of_node_put(np);
 }
 
 /**
drivers/clk/tegra/clk-tegra124.c +1 -0
index 934520aab6e3..a9d4efcef2d4 100644
@@ -1471,6 +1471,7 @@ static void __init tegra124_132_clock_init_pre(struct device_node *np)
 	}
 
 	pmc_base = of_iomap(node, 0);
+	of_node_put(node);
 	if (!pmc_base) {
 		pr_err("Can't map pmc registers\n");
 		WARN_ON(1);
drivers/clk/tegra/clk-tegra30.c +1 -0
index 04b496123820..168c07d5a5f2 100644
@@ -1320,6 +1320,7 @@ static void __init tegra30_clock_init(struct device_node *np)
 	}
 
 	pmc_base = of_iomap(node, 0);
+	of_node_put(node);
 	if (!pmc_base) {
 		pr_err("Can't map pmc registers\n");
 		BUG();
Signature · 1 line
2.25.1
maintainer
#1 lore raw

Quoting Liang He (2022-06-16 05:54:09)

Quoted 8 lines

In these clk-related drivers' xxx_init() funcitons, of_find_matching_node() will return a node pointer with refcount incremented. We should use of_node_put() in fail path or when it is not used anymore.

---
changelog:

Quoted 8 lines

v3: merge clk 'missing of_node_put()' patches into one commit.
v2: use Liang He as real name for S-o-b.
v1: fix the missing of_node_put().

 drivers/clk/clk-nomadik.c        | 5 ++++-
 drivers/clk/tegra/clk-tegra124.c | 1 +
 drivers/clk/tegra/clk-tegra30.c  | 1 +

Please split into a tegra patch and a nomadik patch.

author
#2 lore raw
Quoted 14 lines · Stephen Boyd

Quoting Liang He (2022-06-16 05:54:09)

Quoted 13 lines

In these clk-related drivers' xxx_init() funcitons, of_find_matching_node() will return a node pointer with refcount incremented. We should use of_node_put() in fail path or when it is not used anymore.

---
changelog:

v3: merge clk 'missing of_node_put()' patches into one commit.
v2: use Liang He as real name for S-o-b.
v1: fix the missing of_node_put().

Quoted 5 lines
Quoted 3 lines
 drivers/clk/clk-nomadik.c        | 5 ++++-
 drivers/clk/tegra/clk-tegra124.c | 1 +
 drivers/clk/tegra/clk-tegra30.c  | 1 +

Please split into a tegra patch and a nomadik patch.

Thanks, I will split them and resend soon.