sparc: convert to clocksource_register_hz/khz
authorJohn Stultz <johnstul@us.ibm.com>
Wed, 23 Feb 2011 21:08:21 +0000 (13:08 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 17 Mar 2011 01:19:12 +0000 (18:19 -0700)
This converts the sparc clocksources to use clocksource_register_hz/khz

Signed-off-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/kernel/time_64.c

index e1862793a61d5ec82a51bd8c124852acd0c795a0..95ec25faba39df61360a2abb46498c03a4a77b24 100644 (file)
@@ -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);