Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d53ceec authored by Stephen Boyd's avatar Stephen Boyd
Browse files

ARM: smp: Remove duplicate dummy timer implementation 



Drop ARM's version of the dummy timer now that we have a generic
implementation in drivers/clocksource.

Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 42cba6e2

arch/arm/kernel/smp.c

+2 −20
Original line number Diff line number Diff line
@@ -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