* [PATCH] clocksource: put nodes passed to CLOCKSOURCE_OF_DECLARE callbacks centrally
@ 2013-10-01 9:00 Uwe Kleine-König
2013-10-01 20:01 ` David Brown
2013-10-02 10:21 ` Daniel Lezcano
0 siblings, 2 replies; 3+ messages in thread
From: Uwe Kleine-König @ 2013-10-01 9:00 UTC (permalink / raw)
To: linux-arm-kernel
Instead of letting each driver call of_node_put do it centrally in the
loop that also calls the CLOCKSOURCE_OF_DECLARE callbacks. This is less
prone to error and also moves getting and putting the references into the
same function.
Consequently all respective of_node_put calls in drivers are removed.
Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
arch/arm/mach-msm/timer.c | 1 -
drivers/clocksource/clksrc-of.c | 1 +
drivers/clocksource/dw_apb_timer_of.c | 2 --
drivers/clocksource/tegra20_timer.c | 4 ----
drivers/clocksource/vt8500_timer.c | 2 --
5 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 696fb73..1e9c338 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -274,7 +274,6 @@ static void __init msm_dt_timer_init(struct device_node *np)
pr_err("Unknown frequency\n");
return;
}
- of_node_put(np);
event_base = base + 0x4;
sts_base = base + 0x88;
diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c
index 37f5325..8b2ed14 100644
--- a/drivers/clocksource/clksrc-of.c
+++ b/drivers/clocksource/clksrc-of.c
@@ -32,5 +32,6 @@ void __init clocksource_of_init(void)
for_each_matching_node_and_match(np, __clksrc_of_table, &match) {
init_func = match->data;
init_func(np);
+ of_node_put(np);
}
}
diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c
index 4cbae4f..294aeb7 100644
--- a/drivers/clocksource/dw_apb_timer_of.c
+++ b/drivers/clocksource/dw_apb_timer_of.c
@@ -138,12 +138,10 @@ static void __init dw_apb_timer_init(struct device_node *timer)
case 0:
pr_debug("%s: found clockevent timer\n", __func__);
add_clockevent(timer);
- of_node_put(timer);
break;
case 1:
pr_debug("%s: found clocksource timer\n", __func__);
add_clocksource(timer);
- of_node_put(timer);
init_sched_clock();
break;
default:
diff --git a/drivers/clocksource/tegra20_timer.c b/drivers/clocksource/tegra20_timer.c
index 9396170..fc173a6 100644
--- a/drivers/clocksource/tegra20_timer.c
+++ b/drivers/clocksource/tegra20_timer.c
@@ -181,8 +181,6 @@ static void __init tegra20_init_timer(struct device_node *np)
rate = clk_get_rate(clk);
}
- of_node_put(np);
-
switch (rate) {
case 12000000:
timer_writel(0x000b, TIMERUS_USEC_CFG);
@@ -241,8 +239,6 @@ static void __init tegra20_init_rtc(struct device_node *np)
else
clk_prepare_enable(clk);
- of_node_put(np);
-
register_persistent_clock(NULL, tegra_read_persistent_clock);
}
CLOCKSOURCE_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc);
diff --git a/drivers/clocksource/vt8500_timer.c b/drivers/clocksource/vt8500_timer.c
index 64f553f..ad3c0e8 100644
--- a/drivers/clocksource/vt8500_timer.c
+++ b/drivers/clocksource/vt8500_timer.c
@@ -137,14 +137,12 @@ static void __init vt8500_timer_init(struct device_node *np)
if (!regbase) {
pr_err("%s: Missing iobase description in Device Tree\n",
__func__);
- of_node_put(np);
return;
}
timer_irq = irq_of_parse_and_map(np, 0);
if (!timer_irq) {
pr_err("%s: Missing irq description in Device Tree\n",
__func__);
- of_node_put(np);
return;
}
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] clocksource: put nodes passed to CLOCKSOURCE_OF_DECLARE callbacks centrally
2013-10-01 9:00 [PATCH] clocksource: put nodes passed to CLOCKSOURCE_OF_DECLARE callbacks centrally Uwe Kleine-König
@ 2013-10-01 20:01 ` David Brown
2013-10-02 10:21 ` Daniel Lezcano
1 sibling, 0 replies; 3+ messages in thread
From: David Brown @ 2013-10-01 20:01 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Oct 01, 2013 at 11:00:53AM +0200, Uwe Kleine-K?nig wrote:
>Instead of letting each driver call of_node_put do it centrally in the
>loop that also calls the CLOCKSOURCE_OF_DECLARE callbacks. This is less
>prone to error and also moves getting and putting the references into the
>same function.
>
>Consequently all respective of_node_put calls in drivers are removed.
>
>Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
>---
> arch/arm/mach-msm/timer.c | 1 -
Acked-by: David Brown <davidb@codeaurora.org>
--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] clocksource: put nodes passed to CLOCKSOURCE_OF_DECLARE callbacks centrally
2013-10-01 9:00 [PATCH] clocksource: put nodes passed to CLOCKSOURCE_OF_DECLARE callbacks centrally Uwe Kleine-König
2013-10-01 20:01 ` David Brown
@ 2013-10-02 10:21 ` Daniel Lezcano
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Lezcano @ 2013-10-02 10:21 UTC (permalink / raw)
To: linux-arm-kernel
On 10/01/2013 11:00 AM, Uwe Kleine-K?nig wrote:
> Instead of letting each driver call of_node_put do it centrally in the
> loop that also calls the CLOCKSOURCE_OF_DECLARE callbacks. This is less
> prone to error and also moves getting and putting the references into the
> same function.
>
> Consequently all respective of_node_put calls in drivers are removed.
>
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> ---
Applied in my tree for 3.13.
Thanks
-- Daniel
--
<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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-02 10:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-01 9:00 [PATCH] clocksource: put nodes passed to CLOCKSOURCE_OF_DECLARE callbacks centrally Uwe Kleine-König
2013-10-01 20:01 ` David Brown
2013-10-02 10:21 ` Daniel Lezcano
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).