* [PATCH] arch: arm: mach-spear: Add missing of_node_put() in time.c
@ 2022-06-15 12:39 Liang He
2022-06-16 6:06 ` Viresh Kumar
0 siblings, 1 reply; 3+ messages in thread
From: Liang He @ 2022-06-15 12:39 UTC (permalink / raw)
To: vireshk, shiraz.linux.kernel, soc, linux
Cc: linux-arm-kernel, linux-kernel, windhl
In spear_setup_of_timer(), of_find_matching_node() will return a
node pointer with refcount incrementd. We should use of_node_put()
in each fail path or when it is not used anymore.
Signed-off-by: Liang He <windhl@126.com>
---
arch/arm/mach-spear/time.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c
index d1fdb6066f7b..a1b6635b4ecb 100644
--- a/arch/arm/mach-spear/time.c
+++ b/arch/arm/mach-spear/time.c
@@ -217,16 +217,20 @@ void __init spear_setup_of_timer(void)
irq = irq_of_parse_and_map(np, 0);
if (!irq) {
+ of_node_put(np);
pr_err("%s: No irq passed for timer via DT\n", __func__);
return;
}
gpt_base = of_iomap(np, 0);
if (!gpt_base) {
+ of_node_put(np);
pr_err("%s: of iomap failed\n", __func__);
return;
}
-
+
+ of_node_put(np);
+
gpt_clk = clk_get_sys("gpt0", NULL);
if (IS_ERR(gpt_clk)) {
pr_err("%s:couldn't get clk for gpt\n", __func__);
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] arch: arm: mach-spear: Add missing of_node_put() in time.c
2022-06-15 12:39 [PATCH] arch: arm: mach-spear: Add missing of_node_put() in time.c Liang He
@ 2022-06-16 6:06 ` Viresh Kumar
2022-06-16 6:25 ` Liang He
0 siblings, 1 reply; 3+ messages in thread
From: Viresh Kumar @ 2022-06-16 6:06 UTC (permalink / raw)
To: Liang He
Cc: vireshk, shiraz.linux.kernel, soc, linux, linux-arm-kernel, linux-kernel
On 15-06-22, 20:39, Liang He wrote:
> In spear_setup_of_timer(), of_find_matching_node() will return a
> node pointer with refcount incrementd. We should use of_node_put()
> in each fail path or when it is not used anymore.
>
> Signed-off-by: Liang He <windhl@126.com>
> ---
> arch/arm/mach-spear/time.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c
> index d1fdb6066f7b..a1b6635b4ecb 100644
> --- a/arch/arm/mach-spear/time.c
> +++ b/arch/arm/mach-spear/time.c
> @@ -217,16 +217,20 @@ void __init spear_setup_of_timer(void)
>
> irq = irq_of_parse_and_map(np, 0);
> if (!irq) {
> + of_node_put(np);
> pr_err("%s: No irq passed for timer via DT\n", __func__);
> return;
> }
>
> gpt_base = of_iomap(np, 0);
> if (!gpt_base) {
> + of_node_put(np);
> pr_err("%s: of iomap failed\n", __func__);
> return;
> }
> -
> +
> + of_node_put(np);
> +
> gpt_clk = clk_get_sys("gpt0", NULL);
> if (IS_ERR(gpt_clk)) {
> pr_err("%s:couldn't get clk for gpt\n", __func__);
Since this routine already have error labels, for consistence it would be better
to add another one "err_put_np" and use goto to that ?
--
viresh
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re:Re: [PATCH] arch: arm: mach-spear: Add missing of_node_put() in time.c
2022-06-16 6:06 ` Viresh Kumar
@ 2022-06-16 6:25 ` Liang He
0 siblings, 0 replies; 3+ messages in thread
From: Liang He @ 2022-06-16 6:25 UTC (permalink / raw)
To: Viresh Kumar
Cc: vireshk, shiraz.linux.kernel, soc, linux, linux-arm-kernel, linux-kernel
At 2022-06-16 14:06:05, "Viresh Kumar" <viresh.kumar@linaro.org> wrote:
>On 15-06-22, 20:39, Liang He wrote:
>> In spear_setup_of_timer(), of_find_matching_node() will return a
>> node pointer with refcount incrementd. We should use of_node_put()
>> in each fail path or when it is not used anymore.
>>
>> Signed-off-by: Liang He <windhl@126.com>
>> ---
>> arch/arm/mach-spear/time.c | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c
>> index d1fdb6066f7b..a1b6635b4ecb 100644
>> --- a/arch/arm/mach-spear/time.c
>> +++ b/arch/arm/mach-spear/time.c
>> @@ -217,16 +217,20 @@ void __init spear_setup_of_timer(void)
>>
>> irq = irq_of_parse_and_map(np, 0);
>> if (!irq) {
>> + of_node_put(np);
>> pr_err("%s: No irq passed for timer via DT\n", __func__);
>> return;
>> }
>>
>> gpt_base = of_iomap(np, 0);
>> if (!gpt_base) {
>> + of_node_put(np);
>> pr_err("%s: of iomap failed\n", __func__);
>> return;
>> }
>> -
>> +
>> + of_node_put(np);
>> +
>> gpt_clk = clk_get_sys("gpt0", NULL);
>> if (IS_ERR(gpt_clk)) {
>> pr_err("%s:couldn't get clk for gpt\n", __func__);
>
>Since this routine already have error labels, for consistence it would be better
>to add another one "err_put_np" and use goto to that ?
>
>--
>viresh
Thanks for your reply. I will make a new patch for that.
Liang
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-06-16 6:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-15 12:39 [PATCH] arch: arm: mach-spear: Add missing of_node_put() in time.c Liang He
2022-06-16 6:06 ` Viresh Kumar
2022-06-16 6:25 ` Liang He
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).