2022-06-16 13:15:50

by Liang He

Subject: [PATCH v3] 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.

Signed-off-by: Liang He <[email protected]>
---
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(-)

diff --git a/drivers/clk/clk-nomadik.c b/drivers/clk/clk-nomadik.c
index bad2677e11ae..71fbe687fa7b 100644
--- a/drivers/clk/clk-nomadik.c
+++ b/drivers/clk/clk-nomadik.c
@@ -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);
}

/**
diff --git a/drivers/clk/tegra/clk-tegra124.c b/drivers/clk/tegra/clk-tegra124.c
index 934520aab6e3..a9d4efcef2d4 100644
--- a/drivers/clk/tegra/clk-tegra124.c
+++ b/drivers/clk/tegra/clk-tegra124.c
@@ -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);
diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c
index 04b496123820..168c07d5a5f2 100644
--- a/drivers/clk/tegra/clk-tegra30.c
+++ b/drivers/clk/tegra/clk-tegra30.c
@@ -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();
--
2.25.1

2022-06-17 00:33:37

by Stephen Boyd

Subject: Re: [PATCH v3] drivers: clk: Add missing of_node_put()

Quoting Liang He (2022-06-16 05:54:09)
> 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.
>
> Signed-off-by: Liang He <[email protected]>
> ---
> 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 +

Please split into a tegra patch and a nomadik patch.

2022-06-17 01:24:41

by Liang He

Subject: Re:Re: [PATCH v3] drivers: clk: Add missing of_node_put()

At 2022-06-17 08:09:11, "Stephen Boyd" <[email protected]> wrote:
>Quoting Liang He (2022-06-16 05:54:09)
>> 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.
>>
>> Signed-off-by: Liang He <[email protected]>
>> ---
>> 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 +
>
>Please split into a tegra patch and a nomadik patch.

Thanks, I will split them and resend soon.