sparc: convert to clocksource_register_hz/khz

[mv-sheeva.git] / arch / sparc / kernel / time_64.c

diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index 3bc9c9979b92fd1533caab3a5d1b8959c4c8855e..58aa27b2998407da9c60c1afe3e57b888f20e5e8 100644 (file)
--- 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);