diff options
| author | John Stultz <johnstul@us.ibm.com> | 2010-04-26 23:24:37 -0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-02-21 16:33:49 -0500 |
| commit | 39280742efb00ab61ad62486c737fdd3e980c30f (patch) | |
| tree | 0f37beb64c935af8bf940cf0719601dce79eb3e4 | |
| parent | 7861434fe9b5c9dad1bbb1f674cded95950e778e (diff) | |
sparc: convert to clocksource_register_hz/khz
This converts the sparc clocksources to use clocksource_register_hz/khz
CC: "David S. Miller" <davem@davemloft.net>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
| -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 3bc9c9979b92..58aa27b29984 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 | ||
