From 6662b07521148865773738eb06240a9296906f8b Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Wed, 6 Mar 2019 19:53:30 +0200 Subject: [PATCH] kernel: cobalt: migrate to ktime_t As do_gettimeofday is very old and deprecated, use ktime instead This also fixed the old conversion to nanoseconds in a4l_init_time. Signed-off-by: Roman Stratiienko [Jan: leave note on drive-by fix of a4l_init_time] Signed-off-by: Jan Kiszka --- kernel/cobalt/clock.c | 4 +--- kernel/drivers/analogy/rtdm_helpers.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/kernel/cobalt/clock.c b/kernel/cobalt/clock.c index 272db3241..f8291b006 100644 --- a/kernel/cobalt/clock.c +++ b/kernel/cobalt/clock.c @@ -350,9 +350,7 @@ EXPORT_SYMBOL_GPL(xnclock_adjust); xnticks_t xnclock_get_host_time(void) { - struct timeval tv; - do_gettimeofday(&tv); - return tv.tv_sec * 1000000000ULL + tv.tv_usec * 1000; + return ktime_to_ns(ktime_get_real()); } EXPORT_SYMBOL_GPL(xnclock_get_host_time); diff --git a/kernel/drivers/analogy/rtdm_helpers.c b/kernel/drivers/analogy/rtdm_helpers.c index 8330d0676..675594152 100644 --- a/kernel/drivers/analogy/rtdm_helpers.c +++ b/kernel/drivers/analogy/rtdm_helpers.c @@ -32,11 +32,8 @@ static nanosecs_abs_t a4l_clkofs; void a4l_init_time(void) { nanosecs_abs_t t1, t2; - struct timeval tv; t1 = rtdm_clock_read(); - do_gettimeofday(&tv); - t2 = 1000000000 * ((nanosecs_abs_t)tv.tv_sec) + - 1000000 * ((nanosecs_abs_t)tv.tv_usec); + t2 = ktime_to_ns(ktime_get_real()); a4l_clkofs = t2 - t1; } -- GitLab