Commit-ID: a139723bec122053a94c80596c8b991b860ffb91 Gitweb: http://git.kernel.org/tip/a139723bec122053a94c80596c8b991b860ffb91 Author: John Stultz <johnstul@xxxxxxxxxx> AuthorDate: Mon, 26 Apr 2010 20:25:56 -0700 Committer: John Stultz <john.stultz@xxxxxxxxxx> CommitDate: Mon, 21 Nov 2011 19:01:04 -0800 clocksource: xtensa: Convert to clocksource_register_hz/khz This converts the xtensa clocksource to use clocksource_register_hz/khz This is untested, so any assistance in testing would be appreciated! CC: Chris Zankel <chris@xxxxxxxxxx> CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: John Stultz <johnstul@xxxxxxxxxx> --- arch/xtensa/kernel/time.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index f3e5eb4..ac62f9c 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c @@ -41,14 +41,6 @@ static struct clocksource ccount_clocksource = { .rating = 200, .read = ccount_read, .mask = CLOCKSOURCE_MASK(32), - /* - * With a shift of 22 the lower limit of the cpu clock is - * 1MHz, where NSEC_PER_CCOUNT is 1000 or a bit less than - * 2^10: Since we have 32 bits and the multiplicator can - * already take up as much as 10 bits, this leaves us with - * remaining upper 22 bits. - */ - .shift = 22, }; static irqreturn_t timer_interrupt(int irq, void *dev_id); @@ -66,10 +58,7 @@ void __init time_init(void) printk("%d.%02d MHz\n", (int)ccount_per_jiffy/(1000000/HZ), (int)(ccount_per_jiffy/(10000/HZ))%100); #endif - ccount_clocksource.mult = - clocksource_hz2mult(CCOUNT_PER_JIFFY * HZ, - ccount_clocksource.shift); - clocksource_register(&ccount_clocksource); + clocksource_register_hz(&ccount_clocksource, CCOUNT_PER_JIFFY * HZ); /* Initialize the linux timer interrupt. */ -- 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