소스 검색

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>
WEN Pingbo 7 년 전
부모
커밋
ac45e6293f
2개의 변경된 파일4개의 추가작업 그리고 6개의 파일을 삭제
  1. 3 5
      drivers/input/serio/hil_mlc.c
  2. 1 1
      include/linux/hil_mlc.h

+ 3 - 5
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. */
 /* An LCV used to prevent runaway loops, forces 5 second sleep when reset. */
 static int hilse_init_lcv(hil_mlc *mlc, int unused)
 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;
 		return -1;
 
 
-	mlc->lcv_tv = tv;
+	mlc->lcv_time = now;
 	mlc->lcv = 0;
 	mlc->lcv = 0;
 
 
 	return 0;
 	return 0;

+ 1 - 1
include/linux/hil_mlc.h

@@ -149,7 +149,7 @@ struct hil_mlc {
 
 
 	int			ddi;	/* Last operational device id */
 	int			ddi;	/* Last operational device id */
 	int			lcv;	/* LCV to throttle loops */
 	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 */
 	int			di_map[7]; /* Maps below items to live devs */
 	struct hil_mlc_devinfo	di[HIL_MLC_DEVMEM];
 	struct hil_mlc_devinfo	di[HIL_MLC_DEVMEM];