Commit-ID: b8f39f7dfe12d4c8402c493a24fbf1e21d086771
Gitweb: http://git.kernel.org/tip/b8f39f7dfe12d4c8402c493a24fbf1e21d086771
Author: John Stultz <johnstul@xxxxxxxxxx>
AuthorDate: Mon, 26 Apr 2010 20:22:23 -0700
Committer: John Stultz <john.stultz@xxxxxxxxxx>
CommitDate: Mon, 21 Feb 2011 13:33:46 -0800
microblaze: convert to clocksource_register_hz/khz
This converts the microblaze clocksources to use clocksource_register_hz/khz
CC: Michal Simek <monstr@xxxxxxxxx>
CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Tested-by: Michal Simek <monstr@xxxxxxxxx>
Signed-off-by: John Stultz <johnstul@xxxxxxxxxx>
---
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 a5aa33d..68ec7d1 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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|