[PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Yangtao Li]

use of_node_put() to release the refcount.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
 drivers/clocksource/timer-integrator-ap.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/clocksource/timer-integrator-ap.c b/drivers/clocksource/timer-integrator-ap.c
index 76e526f58620..50e0a9166f66 100644
--- a/drivers/clocksource/timer-integrator-ap.c
+++ b/drivers/clocksource/timer-integrator-ap.c
@@ -204,8 +204,6 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
 		return err;
 	}
 
-	pri_node = of_find_node_by_path(path);
-
 	err = of_property_read_string(of_aliases,
 				"arm,timer-secondary", &path);
 	if (err) {
@@ -213,14 +211,18 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
 		return err;
 	}
 
+	pri_node = of_find_node_by_path(path);
+	if (node == pri_node){
+		of_node_put(pri_node);
 
-	sec_node = of_find_node_by_path(path);
-
-	if (node == pri_node)
 		/* The primary timer lacks IRQ, use as clocksource */
 		return integrator_clocksource_init(rate, base);
+	}
 
+	sec_node = of_find_node_by_path(path);
 	if (node == sec_node) {
+		of_node_put(sec_node);
+
 		/* The secondary timer will drive the clock event */
 		irq = irq_of_parse_and_map(node, 0);
 		return integrator_clockevent_init(rate, base, irq);
-- 
2.17.0

Re: [PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Daniel Lezcano]

Hi Yangtao,

On 20/11/2018 14:18, Yangtao Li wrote:
> use of_node_put() to release the refcount.

In future please give a better description.

No need to resend, I'll do the change.

Linus? I'm about to take this patch. Is it fine for you?

> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> ---
>  drivers/clocksource/timer-integrator-ap.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/clocksource/timer-integrator-ap.c b/drivers/clocksource/timer-integrator-ap.c
> index 76e526f58620..50e0a9166f66 100644
> --- a/drivers/clocksource/timer-integrator-ap.c
> +++ b/drivers/clocksource/timer-integrator-ap.c
> @@ -204,8 +204,6 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
>  		return err;
>  	}
>  
> -	pri_node = of_find_node_by_path(path);
> -
>  	err = of_property_read_string(of_aliases,
>  				"arm,timer-secondary", &path);
>  	if (err) {
> @@ -213,14 +211,18 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
>  		return err;
>  	}
>  
> +	pri_node = of_find_node_by_path(path);
> +	if (node == pri_node){
> +		of_node_put(pri_node);
>  
> -	sec_node = of_find_node_by_path(path);
> -
> -	if (node == pri_node)
>  		/* The primary timer lacks IRQ, use as clocksource */
>  		return integrator_clocksource_init(rate, base);
> +	}
>  
> +	sec_node = of_find_node_by_path(path);
>  	if (node == sec_node) {
> +		of_node_put(sec_node);
> +
>  		/* The secondary timer will drive the clock event */
>  		irq = irq_of_parse_and_map(node, 0);
>  		return integrator_clockevent_init(rate, base, irq);
> 


-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Linus Walleij]

On Tue, Nov 20, 2018 at 2:19 PM Yangtao Li <tiny.windzz@gmail.com> wrote:

> use of_node_put() to release the refcount.
>
> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Daniel Lezcano]

On 22/11/2018 15:22, Linus Walleij wrote:
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> 
Thanks!

-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Daniel Lezcano]

On 20/11/2018 14:18, Yangtao Li wrote:
> use of_node_put() to release the refcount.
> 
> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>

Applied, thanks!


-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Frank Lee]

On Thu, Nov 22, 2018 at 10:26 PM Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
>
> On 20/11/2018 14:18, Yangtao Li wrote:
> > use of_node_put() to release the refcount.
> >
> > Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
>
> Applied, thanks!
Hi Daniel：

This patch is a bit small, I will resend。

Thanks，
Yangtao
>
>
> --
>  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
>
> Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
> <http://twitter.com/#!/linaroorg> Twitter |
> <http://www.linaro.org/linaro-blog/> Blog
>

Re: [PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Frank Lee]

On Thu, Nov 22, 2018 at 10:33 PM Frank Lee <tiny.windzz@gmail.com> wrote:
>
> On Thu, Nov 22, 2018 at 10:26 PM Daniel Lezcano
> <daniel.lezcano@linaro.org> wrote:
> >
> > On 20/11/2018 14:18, Yangtao Li wrote:
> > > use of_node_put() to release the refcount.
> > >
> > > Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> >
> > Applied, thanks!
> Hi Daniel：
>
> This patch is a bit small, I will resend。
Code logic seems to be a bit problem, sorry

--Yangtao
>
> Thanks，
> Yangtao
> >
> >
> > --
> >  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
> >
> > Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
> > <http://twitter.com/#!/linaroorg> Twitter |
> > <http://www.linaro.org/linaro-blog/> Blog
> >

Re: [PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Daniel Lezcano]

On 22/11/2018 15:33, Frank Lee wrote:
> On Thu, Nov 22, 2018 at 10:26 PM Daniel Lezcano
> <daniel.lezcano@linaro.org> wrote:
>>
>> On 20/11/2018 14:18, Yangtao Li wrote:
>>> use of_node_put() to release the refcount.
>>>
>>> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
>>
>> Applied, thanks!
> Hi Daniel：
> 
> This patch is a bit small, I will resend。

What do you mean by 'small' ?

>> --
>>  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
>>
>> Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
>> <http://twitter.com/#!/linaroorg> Twitter |
>> <http://www.linaro.org/linaro-blog/> Blog
>>


-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Frank Lee]

On Thu, Nov 22, 2018 at 10:37 PM Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
>
> On 22/11/2018 15:33, Frank Lee wrote:
> > On Thu, Nov 22, 2018 at 10:26 PM Daniel Lezcano
> > <daniel.lezcano@linaro.org> wrote:
> >>
> >> On 20/11/2018 14:18, Yangtao Li wrote:
> >>> use of_node_put() to release the refcount.
> >>>
> >>> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> >>
> >> Applied, thanks!
> > Hi Daniel：
> >
> > This patch is a bit small, I will resend。
>
> What do you mean by 'small' ?
        pri_node = of_find_node_by_path(path);
        if (node == pri_node){
                of_node_put(pri_node);

                /* The primary timer lacks IRQ, use as clocksource */
                return integrator_clocksource_init(rate, base);
        }

        sec_node = of_find_node_by_path(path);

Under my revision, pri_node and sec_nodeare the same thing.

Yours,
Yangtao
>
> >> --
> >>  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
> >>
> >> Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
> >> <http://twitter.com/#!/linaroorg> Twitter |
> >> <http://www.linaro.org/linaro-blog/> Blog
> >>
>
>
> --
>  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
>
> Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
> <http://twitter.com/#!/linaroorg> Twitter |
> <http://www.linaro.org/linaro-blog/> Blog
>

Re: [PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Daniel Lezcano]

On 22/11/2018 15:39, Frank Lee wrote:
> On Thu, Nov 22, 2018 at 10:37 PM Daniel Lezcano
> <daniel.lezcano@linaro.org> wrote:
>>
>> On 22/11/2018 15:33, Frank Lee wrote:
>>> On Thu, Nov 22, 2018 at 10:26 PM Daniel Lezcano
>>> <daniel.lezcano@linaro.org> wrote:
>>>>
>>>> On 20/11/2018 14:18, Yangtao Li wrote:
>>>>> use of_node_put() to release the refcount.
>>>>>
>>>>> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
>>>>
>>>> Applied, thanks!
>>> Hi Daniel：
>>>
>>> This patch is a bit small, I will resend。
>>
>> What do you mean by 'small' ?
>         pri_node = of_find_node_by_path(path);
>         if (node == pri_node){
>                 of_node_put(pri_node);
> 
>                 /* The primary timer lacks IRQ, use as clocksource */
>                 return integrator_clocksource_init(rate, base);
>         }
> 
>         sec_node = of_find_node_by_path(path);
> 
> Under my revision, pri_node and sec_nodeare the same thing.
> 
> Yours,
> Yangtao
>>
>>>> --
>>>>  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
>>>>
>>>> Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
>>>> <http://twitter.com/#!/linaroorg> Twitter |
>>>> <http://www.linaro.org/linaro-blog/> Blog
>>>>
>>
>>
>> --
>>  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
>>
>> Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
>> <http://twitter.com/#!/linaroorg> Twitter |
>> <http://www.linaro.org/linaro-blog/> Blog
>>


-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Daniel Lezcano]

On 22/11/2018 15:39, Frank Lee wrote:
> On Thu, Nov 22, 2018 at 10:37 PM Daniel Lezcano
> <daniel.lezcano@linaro.org> wrote:
>>
>> On 22/11/2018 15:33, Frank Lee wrote:
>>> On Thu, Nov 22, 2018 at 10:26 PM Daniel Lezcano
>>> <daniel.lezcano@linaro.org> wrote:
>>>>
>>>> On 20/11/2018 14:18, Yangtao Li wrote:
>>>>> use of_node_put() to release the refcount.
>>>>>
>>>>> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
>>>>
>>>> Applied, thanks!
>>> Hi Daniel：
>>>
>>> This patch is a bit small, I will resend。
>>
>> What do you mean by 'small' ?
>         pri_node = of_find_node_by_path(path);
>         if (node == pri_node){
>                 of_node_put(pri_node);
> 
>                 /* The primary timer lacks IRQ, use as clocksource */
>                 return integrator_clocksource_init(rate, base);
>         }
> 
>         sec_node = of_find_node_by_path(path);
> 
> Under my revision, pri_node and sec_nodeare the same thing.

Oh, right. Missed it :/



-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Frank Lee]

On Thu, Nov 22, 2018 at 10:43 PM Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
>
> On 22/11/2018 15:39, Frank Lee wrote:
> > On Thu, Nov 22, 2018 at 10:37 PM Daniel Lezcano
> > <daniel.lezcano@linaro.org> wrote:
> >>
> >> On 22/11/2018 15:33, Frank Lee wrote:
> >>> On Thu, Nov 22, 2018 at 10:26 PM Daniel Lezcano
> >>> <daniel.lezcano@linaro.org> wrote:
> >>>>
> >>>> On 20/11/2018 14:18, Yangtao Li wrote:
> >>>>> use of_node_put() to release the refcount.
> >>>>>
> >>>>> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> >>>>
> >>>> Applied, thanks!
> >>> Hi Daniel：
> >>>
> >>> This patch is a bit small, I will resend。
> >>
> >> What do you mean by 'small' ?
> >         pri_node = of_find_node_by_path(path);
> >         if (node == pri_node){
> >                 of_node_put(pri_node);
> >
> >                 /* The primary timer lacks IRQ, use as clocksource */
> >                 return integrator_clocksource_init(rate, base);
> >         }
> >
> >         sec_node = of_find_node_by_path(path);
> >
> > Under my revision, pri_node and sec_nodeare the same thing.
>
> Oh, right. Missed it :/
Daniel ,

Have you mde the patch merged?
Which git is the patch in?
I hope that you can revert it and I‘ll resend new one
or I'll resend patch based on the modify.

Yours,
Yangtao
>
>
>
> --
>  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
>
> Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
> <http://twitter.com/#!/linaroorg> Twitter |
> <http://www.linaro.org/linaro-blog/> Blog
>

Re: [PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Daniel Lezcano]

On 22/11/2018 15:48, Frank Lee wrote:
> On Thu, Nov 22, 2018 at 10:43 PM Daniel Lezcano
> <daniel.lezcano@linaro.org> wrote:
>>
>> On 22/11/2018 15:39, Frank Lee wrote:
>>> On Thu, Nov 22, 2018 at 10:37 PM Daniel Lezcano
>>> <daniel.lezcano@linaro.org> wrote:
>>>>
>>>> On 22/11/2018 15:33, Frank Lee wrote:
>>>>> On Thu, Nov 22, 2018 at 10:26 PM Daniel Lezcano
>>>>> <daniel.lezcano@linaro.org> wrote:
>>>>>>
>>>>>> On 20/11/2018 14:18, Yangtao Li wrote:
>>>>>>> use of_node_put() to release the refcount.
>>>>>>>
>>>>>>> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
>>>>>>
>>>>>> Applied, thanks!
>>>>> Hi Daniel：
>>>>>
>>>>> This patch is a bit small, I will resend。
>>>>
>>>> What do you mean by 'small' ?
>>>         pri_node = of_find_node_by_path(path);
>>>         if (node == pri_node){
>>>                 of_node_put(pri_node);
>>>
>>>                 /* The primary timer lacks IRQ, use as clocksource */
>>>                 return integrator_clocksource_init(rate, base);
>>>         }
>>>
>>>         sec_node = of_find_node_by_path(path);
>>>
>>> Under my revision, pri_node and sec_nodeare the same thing.
>>
>> Oh, right. Missed it :/
> Daniel ,
> 
> Have you mde the patch merged?
> Which git is the patch in?
> I hope that you can revert it and I‘ll resend new one
> or I'll resend patch based on the modify.

I can drop it, resend a new one.


-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH] clocksource/drivers/integrator-ap: add of_node_put()

[Frank Lee]

On Thu, Nov 22, 2018 at 10:51 PM Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
>
> On 22/11/2018 15:48, Frank Lee wrote:
> > On Thu, Nov 22, 2018 at 10:43 PM Daniel Lezcano
> > <daniel.lezcano@linaro.org> wrote:
> >>
> >> On 22/11/2018 15:39, Frank Lee wrote:
> >>> On Thu, Nov 22, 2018 at 10:37 PM Daniel Lezcano
> >>> <daniel.lezcano@linaro.org> wrote:
> >>>>
> >>>> On 22/11/2018 15:33, Frank Lee wrote:
> >>>>> On Thu, Nov 22, 2018 at 10:26 PM Daniel Lezcano
> >>>>> <daniel.lezcano@linaro.org> wrote:
> >>>>>>
> >>>>>> On 20/11/2018 14:18, Yangtao Li wrote:
> >>>>>>> use of_node_put() to release the refcount.
> >>>>>>>
> >>>>>>> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> >>>>>>
> >>>>>> Applied, thanks!
> >>>>> Hi Daniel：
> >>>>>
> >>>>> This patch is a bit small, I will resend。
> >>>>
> >>>> What do you mean by 'small' ?
> >>>         pri_node = of_find_node_by_path(path);
> >>>         if (node == pri_node){
> >>>                 of_node_put(pri_node);
> >>>
> >>>                 /* The primary timer lacks IRQ, use as clocksource */
> >>>                 return integrator_clocksource_init(rate, base);
> >>>         }
> >>>
> >>>         sec_node = of_find_node_by_path(path);
> >>>
> >>> Under my revision, pri_node and sec_nodeare the same thing.
> >>
> >> Oh, right. Missed it :/
> > Daniel ,
> >
> > Have you mde the patch merged?
> > Which git is the patch in?
> > I hope that you can revert it and I‘ll resend new one
> > or I'll resend patch based on the modify.
>
> I can drop it, resend a new one.
Thanks,
Yangtao
>
>
> --
>  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
>
> Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
> <http://twitter.com/#!/linaroorg> Twitter |
> <http://www.linaro.org/linaro-blog/> Blog
>