ARM: mmp: update clock source registration
Russell King [Mon, 13 Dec 2010 13:18:04 +0000 (13:18 +0000)]
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 <rmk+kernel@arm.linux.org.uk>

arch/arm/mach-mmp/time.c

index 6652819..0c0ab09 100644 (file)
@@ -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);
 }