lkml.org 
[lkml]   [2011]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/8] clocksource: cris: Convert to clocksource_register_khz
    Date
    From: John Stultz <johnstul@us.ibm.com>

    This converts the cris architecture to use clocksource_register_khz

    This is untested, so any help from maintainers would be appreciated.

    CC: Mikael Starvik <starvik@axis.com>
    CC: Jesper Nilsson <jesper.nilsson@axis.com>
    CC: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: John Stultz <johnstul@us.ibm.com>
    ---
    arch/cris/arch-v32/kernel/time.c | 4 +---
    1 files changed, 1 insertions(+), 3 deletions(-)

    diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c
    index bb978ed..6773fc8 100644
    --- a/arch/cris/arch-v32/kernel/time.c
    +++ b/arch/cris/arch-v32/kernel/time.c
    @@ -47,14 +47,12 @@ static struct clocksource cont_rotime = {
    .rating = 300,
    .read = read_cont_rotime,
    .mask = CLOCKSOURCE_MASK(32),
    - .shift = 10,
    .flags = CLOCK_SOURCE_IS_CONTINUOUS,
    };

    static int __init etrax_init_cont_rotime(void)
    {
    - cont_rotime.mult = clocksource_khz2mult(100000, cont_rotime.shift);
    - clocksource_register(&cont_rotime);
    + clocksource_register_khz(&cont_rotime, 100000);
    return 0;
    }
    arch_initcall(etrax_init_cont_rotime);
    --
    1.7.3.2.146.gca209


    \
     
     \ /
      Last update: 2011-10-25 20:15    [W:0.029 / U:28.532 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site