From: Yangtao Li <tiny.windzz@gmail.com>
To: daniel.lezcano@linaro.org, tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org, Yangtao Li <tiny.windzz@gmail.com>
Subject: [PATCH] clocksource/drivers/integrator-ap: add of_node_put()
Date: Tue, 20 Nov 2018 08:18:53 -0500 [thread overview]
Message-ID: <20181120131853.19710-1-tiny.windzz@gmail.com> (raw)
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
next reply other threads:[~2018-11-20 13:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-20 13:18 Yangtao Li [this message]
2018-11-22 14:16 ` [PATCH] clocksource/drivers/integrator-ap: add of_node_put() Daniel Lezcano
2018-11-22 14:22 ` Linus Walleij
2018-11-22 14:26 ` Daniel Lezcano
2018-11-22 14:26 ` Daniel Lezcano
2018-11-22 14:33 ` Frank Lee
2018-11-22 14:36 ` Frank Lee
2018-11-22 14:37 ` Daniel Lezcano
2018-11-22 14:39 ` Frank Lee
2018-11-22 14:41 ` Daniel Lezcano
2018-11-22 14:43 ` Daniel Lezcano
2018-11-22 14:48 ` Frank Lee
2018-11-22 14:51 ` Daniel Lezcano
2018-11-22 14:52 ` Frank Lee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181120131853.19710-1-tiny.windzz@gmail.com \
--to=tiny.windzz@gmail.com \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox