Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac45e629 authored by WEN Pingbo's avatar WEN Pingbo Committed by Dmitry Torokhov
Browse files

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: default avatarWEN Pingbo <pingbo.wen@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Patchwork-Id: 10076611
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent c1b433e0

drivers/input/serio/hil_mlc.c

+3 −5
Original line number Diff line number Diff line
@@ -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;



	do_gettimeofday(&tv);

	time64_t now = ktime_get_seconds();



	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;

include/linux/hil_mlc.h

+1 −1
Original line number Diff line number Diff line
@@ -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];