diff options
author | John Stultz <johnstul@us.ibm.com> | 2011-02-23 16:08:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-16 21:19:12 -0400 |
commit | 81043e811191b5ccc1e6c170ed26f4ac8388834f (patch) | |
tree | ce7a00bb2f8b4a1612410fadc09227cc4d518ceb /arch/sparc | |
parent | 5a0efea09f42f7c92bd98a38d66b4dff9589266b (diff) |
sparc: convert to clocksource_register_hz/khz
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>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/time_64.c | 4 |
1 files changed, 1 insertions, 3 deletions
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) | |||
816 | clocksource_hz2mult(freq, SPARC64_NSEC_PER_CYC_SHIFT); | 816 | clocksource_hz2mult(freq, SPARC64_NSEC_PER_CYC_SHIFT); |
817 | 817 | ||
818 | clocksource_tick.name = tick_ops->name; | 818 | clocksource_tick.name = tick_ops->name; |
819 | clocksource_calc_mult_shift(&clocksource_tick, freq, 4); | ||
820 | clocksource_tick.read = clocksource_tick_read; | 819 | clocksource_tick.read = clocksource_tick_read; |
821 | 820 | ||
821 | clocksource_register_hz(&clocksource_tick, freq); | ||
822 | printk("clocksource: mult[%x] shift[%d]\n", | 822 | printk("clocksource: mult[%x] shift[%d]\n", |
823 | clocksource_tick.mult, clocksource_tick.shift); | 823 | clocksource_tick.mult, clocksource_tick.shift); |
824 | 824 | ||
825 | clocksource_register(&clocksource_tick); | ||
826 | |||
827 | sparc64_clockevent.name = tick_ops->name; | 825 | sparc64_clockevent.name = tick_ops->name; |
828 | clockevents_calc_mult_shift(&sparc64_clockevent, freq, 4); | 826 | clockevents_calc_mult_shift(&sparc64_clockevent, freq, 4); |
829 | 827 | ||