With new interface timecounter_initialize we can initialize timecounter fields and underlying cyclecounter together. Update arch_timer_kvm_info timecounter init with this new function.
Signed-off-by: Sagar Arun Kamble <sagar.a.kam...@intel.com> Cc: Richard Cochran <richardcoch...@gmail.com> Cc: Mark Rutland <mark.rutl...@arm.com> Cc: Marc Zyngier <marc.zyng...@arm.com> Cc: Daniel Lezcano <daniel.lezc...@linaro.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: linux-arm-ker...@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/clocksource/arm_arch_timer.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 31543e5..d96393f 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -910,10 +910,7 @@ static u64 arch_counter_get_cntvct_mem(void) return ((u64) vct_hi << 32) | vct_lo; } -static struct arch_timer_kvm_info arch_timer_kvm_info = { - .timecounter.cc.read = arch_counter_read_cc, - .timecounter.cc.mask = CLOCKSOURCE_MASK(56), -}; +static struct arch_timer_kvm_info arch_timer_kvm_info; struct arch_timer_kvm_info *arch_timer_get_kvm_info(void) { @@ -923,7 +920,6 @@ struct arch_timer_kvm_info *arch_timer_get_kvm_info(void) static void __init arch_counter_register(unsigned type) { u64 start_count; - struct cyclecounter *cc = &arch_timer_kvm_info.timecounter.cc; /* Register the CP15 based counter if we have one */ if (type & ARCH_TIMER_TYPE_CP15) { @@ -943,9 +939,12 @@ static void __init arch_counter_register(unsigned type) start_count = arch_timer_read_counter(); clocksource_register_hz(&clocksource_counter, arch_timer_rate); - cc->mult = clocksource_counter.mult; - cc->shift = clocksource_counter.shift; - timecounter_init(&arch_timer_kvm_info.timecounter, start_count); + timecounter_initialize(&arch_timer_kvm_info.timecounter, + arch_counter_read_cc, + CLOCKSOURCE_MASK(56), + clocksource_counter.mult, + clocksource_counter.shift, + start_count); /* 56 bits minimum, so we assume worst case rollover */ sched_clock_register(arch_timer_read_counter, 56, arch_timer_rate); -- 1.9.1