Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

[android-x86/device-generic-common.git] / tp_smapi / hdaps.c

diff --git a/tp_smapi/hdaps.c b/tp_smapi/hdaps.c
index f54099a..76930a3 100644 (file)
--- a/tp_smapi/hdaps.c
+++ b/tp_smapi/hdaps.c
@@ -62,7 +62,7 @@ static const struct thinkpad_ec_row ec_accel_args =
 
 #define HDAPS_INPUT_FUZZ       4       /* input event threshold */
 #define HDAPS_INPUT_FLAT       4
-#define KMACT_REMEMBER_PERIOD   (HZ/10) /* keyboard/mouse persistance */
+#define KMACT_REMEMBER_PERIOD   (HZ/10) /* keyboard/mouse persistence */
 
 /* Input IDs */
 #define HDAPS_INPUT_VENDOR     PCI_VENDOR_ID_IBM
@@ -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;