Commit-ID: f5a54dd7952e9032785cd1ef0dde72cd61025341 Gitweb: http://git.kernel.org/tip/f5a54dd7952e9032785cd1ef0dde72cd61025341 Author: John Stultz <john.stultz@xxxxxxxxxx> AuthorDate: Fri, 20 May 2011 16:45:37 -0700 Committer: John Stultz <john.stultz@xxxxxxxxxx> CommitDate: Mon, 21 Nov 2011 19:01:42 -0800 clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz Convert tcb_clksrc to use clocksource_register_hz. CC: Nikolaus Voss <n.voss@xxxxxxxxxxx> CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Acked-by: Nikolaus Voss <n.voss@xxxxxxxxxxx> 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); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html