提交: 7ce62c66d43d5ca5c338b546b2750fe586d30c81 - device-generic-common (git)

device/generic/common

Commit MetaInfo

• 修订版: 7ce62c66d43d5ca5c338b546b2750fe586d30c81 (tree)
• 时间: 2018-12-19 13:05:28
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Update tp_smapi to 0.43

Copied from https://github.com/evgeni/tp_smapi
commit a63729a.

更改概述

• modified: tp_smapi/hdaps.c
• modified: tp_smapi/thinkpad_ec.c
• modified: tp_smapi/tp_smapi.c

差异

--- 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,11 +783,11 @@ 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)
-	timer_setup(&hdaps_timer, hdaps_mousedev_poll, 0);
-#else
+#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)

--- a/tp_smapi/thinkpad_ec.c
+++ b/tp_smapi/thinkpad_ec.c
@@ -45,7 +45,7 @@
 	#include <linux/semaphore.h>
 #endif
 
-#define TP_VERSION "0.42"
+#define TP_VERSION "0.43"
 
 MODULE_AUTHOR("Shem Multinymous");
 MODULE_DESCRIPTION("ThinkPad embedded controller hardware access");

--- a/tp_smapi/tp_smapi.c
+++ b/tp_smapi/tp_smapi.c
@@ -47,7 +47,7 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
-#define TP_VERSION "0.42"
+#define TP_VERSION "0.43"
 #define TP_DESC "ThinkPad SMAPI Support"
 #define TP_DIR "smapi"