From: Russell King Date: Mon, 13 Dec 2010 13:18:04 +0000 (+0000) Subject: ARM: mmp: update clock source registration X-Git-Tag: v2.6.38-rc1~471^2~3^2~33 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5975f496e07e0f1e396939308b815f99907440ea;p=platform%2Fupstream%2Fkernel-adaptation-pc.git ARM: mmp: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King --- diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c index 6652819..0c0ab09 100644 --- a/arch/arm/mach-mmp/time.c +++ b/arch/arm/mach-mmp/time.c @@ -146,7 +146,6 @@ static cycle_t clksrc_read(struct clocksource *cs) static struct clocksource cksrc = { .name = "clocksource", - .shift = 20, .rating = 200, .read = clksrc_read, .mask = CLOCKSOURCE_MASK(32), @@ -193,10 +192,8 @@ void __init timer_init(int irq) ckevt.min_delta_ns = clockevent_delta2ns(MIN_DELTA, &ckevt); ckevt.cpumask = cpumask_of(0); - cksrc.mult = clocksource_hz2mult(CLOCK_TICK_RATE, cksrc.shift); - setup_irq(irq, &timer_irq); - clocksource_register(&cksrc); + clocksource_register_hz(&cksrc, CLOCK_TICK_RATE); clockevents_register_device(&ckevt); }