From 448aadb519f33d8ffb75d856c7ee9d54cadded70 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 14 Feb 2018 15:32:25 +0100
Subject: [PATCH] tp_smapi-dkms: add upstream patch for kernel 4.15.

---
 srcpkgs/tp_smapi-dkms/patches/timer.patch | 43 +++++++++++++++++++++++
 srcpkgs/tp_smapi-dkms/template            |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/tp_smapi-dkms/patches/timer.patch

diff --git a/srcpkgs/tp_smapi-dkms/patches/timer.patch b/srcpkgs/tp_smapi-dkms/patches/timer.patch
new file mode 100644
index 00000000000..03a10a05e49
--- /dev/null
+++ b/srcpkgs/tp_smapi-dkms/patches/timer.patch
@@ -0,0 +1,43 @@
+From 76c5120f7be4880cf2c6801f872327e4e70c449f Mon Sep 17 00:00:00 2001
+From: Jan Nordholz <jnordholz@sec.t-labs.tu-berlin.de>
+Date: Mon, 4 Dec 2017 03:27:11 +0100
+Subject: [PATCH] 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 <jnordholz@sec.t-labs.tu-berlin.de>
+Closes: #31
+---
+ hdaps.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/hdaps.c b/hdaps.c
+index 0763c3a..76930a3 100644
+--- hdaps.c
++++ 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;
diff --git a/srcpkgs/tp_smapi-dkms/template b/srcpkgs/tp_smapi-dkms/template
index 0617a9f2ab1..34f35bb21cb 100644
--- a/srcpkgs/tp_smapi-dkms/template
+++ b/srcpkgs/tp_smapi-dkms/template
@@ -1,7 +1,7 @@
 # Template file for 'tp_smapi-dkms'
 pkgname=tp_smapi-dkms
 version=0.42
-revision=2
+revision=3
 wrksrc=tp_smapi-${version}
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 short_desc="IBM ThinkPad hardware functions driver"