RE: [PATCH 1/8] clocksource: Convert tcb_clksrc to useclocksource_register_hz/khz

[Voss, Nikolaus]

> -----Original Message-----
> From: y@xxxxxxxxxxxxxxxxxxxxxxxx [mailto:y@xxxxxxxxxxxxxxxxxxxxxxxx]
> Sent: Tuesday, October 25, 2011 8:08 PM
> To: lkml
> Cc: John Stultz; Voss, Nikolaus; Thomas Gleixner
> Subject: [PATCH 1/8] clocksource: Convert tcb_clksrc to use
> clocksource_register_hz/khz
> 
> From: John Stultz <john.stultz@xxxxxxxxxx>
> 
> Convert tcb_clksrc to use clocksource_register_hz.
> 
> Untested. Help from maintainers would be appreciated.
> 
> CC: Nikolaus Voss <n.voss@xxxxxxxxxxx>
> CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
> ---
>  drivers/clocksource/tcb_clksrc.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/clocksource/tcb_clksrc.c
> b/drivers/clocksource/tcb_clksrc.c
> index 79c47e8..55d0f95 100644
> --- a/drivers/clocksource/tcb_clksrc.c
> +++ b/drivers/clocksource/tcb_clksrc.c
> @@ -59,7 +59,6 @@ static struct clocksource clksrc = {
>  	.rating         = 200,
>  	.read           = tc_get_cycles,
>  	.mask           = CLOCKSOURCE_MASK(32),
> -	.shift          = 18,
>  	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
>  };
> 
> @@ -256,7 +255,6 @@ static int __init tcb_clksrc_init(void)
>  		best_divisor_idx = i;
>  	}
> 
> -	clksrc.mult = clocksource_hz2mult(divided_rate, clksrc.shift);
> 
>  	printk(bootinfo, clksrc.name, CONFIG_ATMEL_TCB_CLKSRC_BLOCK,
>  			divided_rate / 1000000,
> @@ -292,7 +290,7 @@ static int __init tcb_clksrc_init(void)
>  	__raw_writel(ATMEL_TC_SYNC, tcaddr + ATMEL_TC_BCR);
> 
>  	/* and away we go! */
> -	clocksource_register(&clksrc);
> +	clocksource_register_hz(&clksrc, divided_rate);
> 
>  	/* channel 2:  periodic and oneshot timer support */
>  	setup_clkevents(tc, clk32k_divisor_idx);
> --
> 1.7.3.2.146.gca209

This works on my G45 system.

Acked-by: Nikolaus Voss <n.voss@xxxxxxxxxxx>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/