Adapt HDAPS driver to use the new timer_setup() interface.

Linux 4.15 removed the ancient init_timer() API and changed the signature of the timer handler function. Signed-off-by: Jan Nordholz <[email protected]> Closes: #31
linux-thinkpad · Dec 27, 2017 · 76c5120 · 76c5120
1 parent fc60d0d
commit 76c5120
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/hdaps.c b/hdaps.c
@@ -469,7 +469,11 @@ static void hdaps_calibrate(void)
 /* Timer handler for updating the input device. Runs in softirq context,
  * so avoid lenghty or blocking operations.
  */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
 static void hdaps_mousedev_poll(unsigned long unused)
+#else
+static void hdaps_mousedev_poll(struct timer_list *unused)
+#endif
 {
 	int ret;
 
@@ -779,8 +783,12 @@ static int __init hdaps_init(void)
 			hdaps_invert = 0; /* default */
 
 	/* Init timer before platform_driver_register, in case of suspend */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
 	init_timer(&hdaps_timer);
 	hdaps_timer.function = hdaps_mousedev_poll;
+#else
+	timer_setup(&hdaps_timer, hdaps_mousedev_poll, 0);
+#endif
 	ret = platform_driver_register(&hdaps_driver);
 	if (ret)
 		goto out;