clocksource: Put nodes passed to CLOCKSOURCE_OF_DECLARE callbacks centrally

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>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: David Brown <davidb@codeaurora.org>

5 files changed, 1 insertions, 9 deletions

diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 696fb73296d0..1e9c3383daba 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 37f5325bec95..8b2ed14f121d 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 003b2309f463..482618b59fa4 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 5cff61677b6c..642849256d82 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 64f553f04fa4..ad3c0e83a779 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;
         }