From 010f3f1692b22f8ddabdccc6526915e181e49447 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Mon, 26 Apr 2010 20:21:52 -0700 Subject: clocksource: m86k: Convert to clocksource_register_hz/khz This converts the m86k clocksources to use clocksource_register_hz/khz CC: Geert Uytterhoeven CC: Greg Ungerer Acked-by: Greg Ungerer Signed-off-by: John Stultz --- arch/m68k/platform/coldfire/timers.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/m68k/platform/coldfire/timers.c') diff --git a/arch/m68k/platform/coldfire/timers.c b/arch/m68k/platform/coldfire/timers.c index 60242f65fea9..0d90da32fcdb 100644 --- a/arch/m68k/platform/coldfire/timers.c +++ b/arch/m68k/platform/coldfire/timers.c @@ -88,7 +88,6 @@ static struct clocksource mcftmr_clk = { .name = "tmr", .rating = 250, .read = mcftmr_read_clk, - .shift = 20, .mask = CLOCKSOURCE_MASK(32), .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -109,8 +108,7 @@ void hw_timer_init(void) __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 | MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR)); - mcftmr_clk.mult = clocksource_hz2mult(FREQ, mcftmr_clk.shift); - clocksource_register(&mcftmr_clk); + clocksource_register_hz(&mcftmr_clk, FREQ); setup_irq(MCF_IRQ_TIMER, &mcftmr_timer_irq); -- cgit v1.2.3