ARM: smp: Remove duplicate dummy timer implementation
authorStephen Boyd <sboyd@codeaurora.org>
Tue, 5 Mar 2013 01:15:19 +0000 (17:15 -0800)
committerStephen Boyd <sboyd@codeaurora.org>
Tue, 25 Jun 2013 00:45:58 +0000 (17:45 -0700)
Drop ARM's version of the dummy timer now that we have a generic
implementation in drivers/clocksource.

Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
arch/arm/kernel/smp.c

index 47ab90563bf48b3febdef5fd4085cd2071d551f9..4dc883a77adc7dad3107c9c902f46e3af23d0033 100644 (file)
@@ -503,24 +503,6 @@ void tick_broadcast(const struct cpumask *mask)
 }
 #endif
 
-static void broadcast_timer_set_mode(enum clock_event_mode mode,
-       struct clock_event_device *evt)
-{
-}
-
-static void __cpuinit broadcast_timer_setup(struct clock_event_device *evt)
-{
-       evt->name       = "dummy_timer";
-       evt->features   = CLOCK_EVT_FEAT_ONESHOT |
-                         CLOCK_EVT_FEAT_PERIODIC |
-                         CLOCK_EVT_FEAT_DUMMY;
-       evt->rating     = 100;
-       evt->mult       = 1;
-       evt->set_mode   = broadcast_timer_set_mode;
-
-       clockevents_register_device(evt);
-}
-
 static struct local_timer_ops *lt_ops;
 
 #ifdef CONFIG_LOCAL_TIMERS
@@ -544,8 +526,8 @@ static void __cpuinit percpu_timer_setup(void)
 
        evt->cpumask = cpumask_of(cpu);
 
-       if (!lt_ops || lt_ops->setup(evt))
-               broadcast_timer_setup(evt);
+       if (lt_ops)
+               lt_ops->setup(evt);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU