ARM: SA11x0: 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 <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 74b6e0e570b64e247681d052da44f6dcb645e16b..96154f578cd55975bcb7e8fb6b8581d616ce5318 100644 (file)
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -81,7 +81,6 @@ static struct clocksource cksrc_sa1100_oscr = {
        .rating         = 200,
        .read           = sa1100_read_oscr,
        .mask           = CLOCKSOURCE_MASK(32),
-       .shift          = 20,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -105,12 +104,9 @@ static void __init sa1100_timer_init(void)
                clockevent_delta2ns(MIN_OSCR_DELTA * 2, &ckevt_sa1100_osmr0) + 1;
        ckevt_sa1100_osmr0.cpumask = cpumask_of(0);
 
-       cksrc_sa1100_oscr.mult =
-               clocksource_hz2mult(CLOCK_TICK_RATE, cksrc_sa1100_oscr.shift);
-
        setup_irq(IRQ_OST0, &sa1100_timer_irq);
 
-       clocksource_register(&cksrc_sa1100_oscr);
+       clocksource_register_hz(&cksrc_sa1100_oscr, CLOCK_TICK_RATE);
        clockevents_register_device(&ckevt_sa1100_osmr0);
 }