1 files changed, 2 insertions, 16 deletions

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 16b37e7196f5..e4d8701f99f9 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -208,8 +208,7 @@ static void __init omap_dmtimer_init(void)
         /* If we are a secure device, remove any secure timer nodes */
         if ((omap_type() != OMAP2_DEVICE_TYPE_GP)) {
                 np = omap_get_timer_dt(omap_timer_match, "ti,timer-secure");
-                if (np)
-                        of_node_put(np);
+                of_node_put(np);
         }
 }
 
@@ -649,23 +648,10 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon",
 
 #ifdef CONFIG_ARCH_OMAP4
 #ifdef CONFIG_HAVE_ARM_TWD
-static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29);
 void __init omap4_local_timer_init(void)
 {
         omap4_sync32k_timer_init();
-        /* Local timers are not supprted on OMAP4430 ES1.0 */
-        if (omap_rev() != OMAP4430_REV_ES1_0) {
-                int err;
-
-                if (of_have_populated_dt()) {
-                        clocksource_of_init();
-                        return;
-                }
-
-                err = twd_local_timer_register(&twd_local_timer);
-                if (err)
-                        pr_err("twd_local_timer_register failed %d\n", err);
-        }
+        clocksource_of_init();
 }
 #else
 void __init omap4_local_timer_init(void)