From 696639cc6872c500c746553cd4c5c2bad5e54730 Mon Sep 17 00:00:00 2001 From: Jason Gerecke Date: Thu, 6 Jun 2024 13:41:01 -0700 Subject: [PATCH 1/2] Input: wacom_w8001 - correct device name generation Fixes: 6c7cc1a29d1e ("Input: wacom_w8001 - simplify device name generation") Signed-off-by: Jason Gerecke Link: https://lore.kernel.org/r/20240605164656.61623-1-jason.gerecke@wacom.com Signed-off-by: Dmitry Torokhov [jason.gerecke@wacom.com: Imported into input-wacom (7ba38c2a9e1a)] Signed-off-by: Jason Gerecke --- 4.5/wacom_w8001.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4.5/wacom_w8001.c b/4.5/wacom_w8001.c index c6190851..4ddb6b3b 100644 --- a/4.5/wacom_w8001.c +++ b/4.5/wacom_w8001.c @@ -649,7 +649,7 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv) } if (!err_touch) { - snprintf(w8001->pen_name, sizeof(w8001->pen_name), + snprintf(w8001->touch_name, sizeof(w8001->touch_name), "%s Finger", basename); input_dev_touch->name = w8001->touch_name; From a1151f8377581375e56c18399d18b191131e3b66 Mon Sep 17 00:00:00 2001 From: Jason Gerecke Date: Fri, 7 Jun 2024 11:02:21 -0700 Subject: [PATCH 2/2] Revert "github: Temporarily set -Wno-error=unused-result to bypass upstream warning" This reverts commit e83a9bb3e48d2d1b52ec709e60f73b9960d568e5. We have fixed the w8001 driver to no longer trigger these warnings. --- .github/workflows/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ca87b81c..c1f67f57 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,22 +30,22 @@ jobs: compile_cflags: -fno-pie -Wno-error=format-truncation prepare_cflags: -fno-pie -no-pie - kernel: "4.5" - compile_cflags: -fno-pie -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result + compile_cflags: -fno-pie -Wno-error=format-truncation -Wno-error=pointer-sign prepare_cflags: -fno-pie -no-pie - kernel: "4.6" - compile_cflags: -fno-pie -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result + compile_cflags: -fno-pie -Wno-error=format-truncation -Wno-error=pointer-sign prepare_cflags: -fno-pie -no-pie - kernel: "4.10" - compile_cflags: -fno-pie -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result + compile_cflags: -fno-pie -Wno-error=format-truncation -Wno-error=pointer-sign prepare_cflags: -fno-pie -no-pie - kernel: "4.14" - compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result + compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign - kernel: "4.19" - compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result + compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign - kernel: "5.10" - compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result + compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign - kernel: "6.3" - compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result + compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign build_makeflags: KBUILD_MODPOST_WARN=1 steps: - name: Install dependencies