diff options
author | John Stultz | 2010-04-27 05:22:23 +0200 |
---|---|---|
committer | John Stultz | 2011-02-21 22:33:46 +0100 |
commit | b8f39f7dfe12d4c8402c493a24fbf1e21d086771 (patch) | |
tree | 1c2ebc851cb544255c5d2cc658802361d0e5f7e4 | |
parent | ia64: convert to clocksource_register_hz/khz (diff) | |
download | kernel-qcow2-linux-b8f39f7dfe12d4c8402c493a24fbf1e21d086771.tar.gz kernel-qcow2-linux-b8f39f7dfe12d4c8402c493a24fbf1e21d086771.tar.xz kernel-qcow2-linux-b8f39f7dfe12d4c8402c493a24fbf1e21d086771.zip |
microblaze: convert to clocksource_register_hz/khz
This converts the microblaze clocksources to use clocksource_register_hz/khz
CC: Michal Simek <monstr@monstr.eu>
CC: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
-rw-r--r-- | arch/microblaze/kernel/timer.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index a5aa33db1df3..68ec7d1e8439 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c @@ -217,16 +217,12 @@ static struct clocksource clocksource_microblaze = { .rating = 300, .read = microblaze_read, .mask = CLOCKSOURCE_MASK(32), - .shift = 8, /* I can shift it */ .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static int __init microblaze_clocksource_init(void) { - clocksource_microblaze.mult = - clocksource_hz2mult(timer_clock_freq, - clocksource_microblaze.shift); - if (clocksource_register(&clocksource_microblaze)) + if (clocksource_register_hz(&clocksource_microblaze, timer_clock_freq)) panic("failed to register clocksource"); /* stop timer1 */ |