コミット: e0854547dfc34d9ce1348eff447cc950b9f8a4cb - device-generic-common (git)

device/generic/common

コミットメタ情報

• リビジョン: e0854547dfc34d9ce1348eff447cc950b9f8a4cb (tree)
• 日時: 2018-02-23 12:45:59
• 作者: Mauro Rossi <issor.oruam@gmai...>
• コミッター: Chih-Wei Huang

ログメッセージ

tp_smapi/hdaps: use timer_setup() with kernel 4.15 and later

Fixes the following building error happening with kernel 4.15:

CC [M] .../out/target/product/x86/obj/kmodule/tp_smapi/hdaps.o

.../out/target/product/x86/obj/kmodule/tp_smapi/hdaps.c: In function 'hdaps_init':
.../out/target/product/x86/obj/kmodule/tp_smapi/hdaps.c:782:2:
error: implicit declaration of function 'init_timer' [-Werror=implicit-function-declaration]

init_timer(&hdaps_timer);

.../out/target/product/x86/obj/kmodule/tp_smapi/hdaps.c:783:23:
warning: assignment from incompatible pointer type

hdaps_timer.function = hdaps_mousedev_poll;

cc1: some warnings being treated as errors

変更サマリ

• modified: tp_smapi/hdaps.c

差分

--- a/tp_smapi/hdaps.c
+++ b/tp_smapi/hdaps.c
@@ -779,8 +779,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)
+	timer_setup(&hdaps_timer, hdaps_mousedev_poll, 0);
+#else
 	init_timer(&hdaps_timer);
 	hdaps_timer.function = hdaps_mousedev_poll;
+#endif
 	ret = platform_driver_register(&hdaps_driver);
 	if (ret)
 		goto out;