From: John Stultz Date: Wed, 23 Feb 2011 21:08:21 +0000 (-0800) Subject: sparc: convert to clocksource_register_hz/khz X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=81043e811191b5ccc1e6c170ed26f4ac8388834f;p=deliverable%2Flinux.git sparc: convert to clocksource_register_hz/khz This converts the sparc clocksources to use clocksource_register_hz/khz Signed-off-by: John Stultz Signed-off-by: David S. Miller --- diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c index e1862793a61d..95ec25faba39 100644 --- a/arch/sparc/kernel/time_64.c +++ b/arch/sparc/kernel/time_64.c @@ -816,14 +816,12 @@ void __init time_init(void) clocksource_hz2mult(freq, SPARC64_NSEC_PER_CYC_SHIFT); clocksource_tick.name = tick_ops->name; - clocksource_calc_mult_shift(&clocksource_tick, freq, 4); clocksource_tick.read = clocksource_tick_read; + clocksource_register_hz(&clocksource_tick, freq); printk("clocksource: mult[%x] shift[%d]\n", clocksource_tick.mult, clocksource_tick.shift); - clocksource_register(&clocksource_tick); - sparc64_clockevent.name = tick_ops->name; clockevents_calc_mult_shift(&sparc64_clockevent, freq, 4);