Input: hil_mlc - convert timeval to time64_t

Since mlc->lcv_t is only interested in seconds, directly using time64_t
here.

This gets rid of the deprecated do_gettimeofday() and avoids problems
with time going backwards since we now use the monotonic clocksource.

Signed-off-by: WEN Pingbo <pingbo.wen@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Patchwork-Id: 10076611
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c
index d66d01c5373b27a94e572c7c87cdc0783c5f6fe1..581e47119363a5550fa9c5b5d454e4507524939f 100644 (file)
--- a/drivers/input/serio/hil_mlc.c
+++ b/drivers/input/serio/hil_mlc.c
@@ -274,14 +274,12 @@ static int hilse_match(hil_mlc *mlc, int unused)
 /* An LCV used to prevent runaway loops, forces 5 second sleep when reset. */
 static int hilse_init_lcv(hil_mlc *mlc, int unused)
 {
-       struct timeval tv;
+       time64_t now = ktime_get_seconds();
 
-       do_gettimeofday(&tv);
-
-       if (mlc->lcv && (tv.tv_sec - mlc->lcv_tv.tv_sec) < 5)
+       if (mlc->lcv && (now - mlc->lcv_time) < 5)
                return -1;
 
-       mlc->lcv_tv = tv;
+       mlc->lcv_time = now;
        mlc->lcv = 0;
 
        return 0;

diff --git a/include/linux/hil_mlc.h b/include/linux/hil_mlc.h
index 394a8405dd74d96c1c09ec269de52457bd685bb0..d6fc839bdf46fadd0d78095638920e7d0cd313e8 100644 (file)
--- a/include/linux/hil_mlc.h
+++ b/include/linux/hil_mlc.h
@@ -149,7 +149,7 @@ struct hil_mlc {
 
        int                     ddi;    /* Last operational device id */
        int                     lcv;    /* LCV to throttle loops */
-       struct timeval          lcv_tv; /* Time loop was started */
+       time64_t                lcv_time; /* Time loop was started */
 
        int                     di_map[7]; /* Maps below items to live devs */
        struct hil_mlc_devinfo  di[HIL_MLC_DEVMEM];