ARM: ns9xxx: update clock source registration
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 13 Dec 2010 13:18:32 +0000 (13:18 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 22 Dec 2010 22:44:34 +0000 (22:44 +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-ns9xxx/time-ns9360.c

index 77281260358a504f3f5be293074636b8502deed8..9ca32f55728bda7e8d74ee01883ccfcf2cdb05f7 100644 (file)
@@ -35,7 +35,6 @@ static struct clocksource ns9360_clocksource = {
        .rating = 300,
        .read   = ns9360_clocksource_read,
        .mask   = CLOCKSOURCE_MASK(32),
-       .shift  = 20,
        .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -148,10 +147,7 @@ static void __init ns9360_timer_init(void)
 
        __raw_writel(tc, SYS_TC(TIMER_CLOCKSOURCE));
 
-       ns9360_clocksource.mult = clocksource_hz2mult(ns9360_cpuclock(),
-                       ns9360_clocksource.shift);
-
-       clocksource_register(&ns9360_clocksource);
+       clocksource_register_hz(&ns9360_clocksource, ns9360_cpuclock());
 
        latch = SH_DIV(ns9360_cpuclock(), HZ, 0);