Use clocksource_register_hz which calculates the shift/mult
factors for us.

Signed-off-by: Anton Blanchard <an...@samba.org>
---

Index: linux-build/arch/powerpc/kernel/time.c
===================================================================
--- linux-build.orig/arch/powerpc/kernel/time.c 2011-11-03 10:19:59.493679032 
+1100
+++ linux-build/arch/powerpc/kernel/time.c      2011-11-03 10:20:00.965704053 
+1100
@@ -86,8 +86,6 @@ static struct clocksource clocksource_rt
        .rating       = 400,
        .flags        = CLOCK_SOURCE_IS_CONTINUOUS,
        .mask         = CLOCKSOURCE_MASK(64),
-       .shift        = 22,
-       .mult         = 0,      /* To be filled in */
        .read         = rtc_read,
 };
 
@@ -97,8 +95,6 @@ static struct clocksource clocksource_ti
        .rating       = 400,
        .flags        = CLOCK_SOURCE_IS_CONTINUOUS,
        .mask         = CLOCKSOURCE_MASK(64),
-       .shift        = 22,
-       .mult         = 0,      /* To be filled in */
        .read         = timebase_read,
 };
 
@@ -875,9 +871,7 @@ static void __init clocksource_init(void
        else
                clock = &clocksource_timebase;
 
-       clock->mult = clocksource_hz2mult(tb_ticks_per_sec, clock->shift);
-
-       if (clocksource_register(clock)) {
+       if (clocksource_register_hz(clock, tb_ticks_per_sec)) {
                printk(KERN_ERR "clocksource: %s is already registered\n",
                       clock->name);
                return;


_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Reply via email to