Skip to content

Commit

Permalink
ARM: smp: Remove duplicate dummy timer implementation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Boyd committed Jun 25, 2013
1 parent 42cba6e commit 3d53cee
Showing 1 changed file with 2 additions and 20 deletions.
22 changes: 2 additions & 20 deletions arch/arm/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 3d53cee

Please sign in to comment.