Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-16 10:45:04 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-16 10:45:10 +0200
commit1f2823a3c3e94014aa33a690469af5e917391df7 (patch)
treebd7b8ee131269a15d64e6e1c59acbecf089e5bea
parentf9af2b5d6ef888db74e9d796d4cdf4dfcf48a13e (diff)
HID: wacom: Mark expected switch fall-through (bsc#1051510).
-rw-r--r--patches.drivers/HID-wacom-Mark-expected-switch-fall-through.patch53
-rw-r--r--series.conf1
2 files changed, 54 insertions, 0 deletions
diff --git a/patches.drivers/HID-wacom-Mark-expected-switch-fall-through.patch b/patches.drivers/HID-wacom-Mark-expected-switch-fall-through.patch
new file mode 100644
index 0000000000..8b7bf28c65
--- /dev/null
+++ b/patches.drivers/HID-wacom-Mark-expected-switch-fall-through.patch
@@ -0,0 +1,53 @@
+From 1da92d436c93a6ffc049f60206b684db2d25882f Mon Sep 17 00:00:00 2001
+From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
+Date: Mon, 11 Feb 2019 16:04:22 -0600
+Subject: [PATCH] HID: wacom: Mark expected switch fall-through
+Mime-version: 1.0
+Content-type: text/plain; charset=UTF-8
+Content-transfer-encoding: 8bit
+Git-commit: 1da92d436c93a6ffc049f60206b684db2d25882f
+Patch-mainline: v5.1-rc1
+References: bsc#1051510
+
+In preparation to enabling -Wimplicit-fallthrough, mark switch
+cases where we are expecting to fall through.
+
+This patch fixes the following warning:
+
+Drivers/hid/wacom_wac.c: In function ‘wacom_setup_pen_input_capabilities’:
+drivers/hid/wacom_wac.c:3506:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
+ __clear_bit(ABS_MISC, input_dev->absbit);
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+drivers/hid/wacom_wac.c:3508:2: note: here
+ case WACOM_MO:
+ ^~~~
+
+Warning level 3 was used: -Wimplicit-fallthrough=3
+
+This patch is part of the ongoing efforts to enable
+-Wimplicit-fallthrough.
+
+Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
+Acked-by: Ping Cheng <ping.cheng@wacom.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/hid/wacom_wac.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
+index 72477e872324..5ecda99bf431 100644
+--- a/drivers/hid/wacom_wac.c
++++ b/drivers/hid/wacom_wac.c
+@@ -3504,6 +3504,7 @@ int wacom_setup_pen_input_capabilities(struct input_dev *input_dev,
+ switch (features->type) {
+ case GRAPHIRE_BT:
+ __clear_bit(ABS_MISC, input_dev->absbit);
++ /* fall through */
+
+ case WACOM_MO:
+ case WACOM_G4:
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 155c1e8f92..bed0627d32 100644
--- a/series.conf
+++ b/series.conf
@@ -21577,6 +21577,7 @@
patches.drivers/HID-i2c-hid-Ignore-input-report-if-there-s-no-data-p.patch
patches.drivers/HID-intel-ish-hid-avoid-binding-wrong-ishtp_cl_devic.patch
patches.drivers/HID-wacom-Move-HID-fix-for-AES-serial-number-into-wa.patch
+ patches.drivers/HID-wacom-Mark-expected-switch-fall-through.patch
patches.arch/x86-mce-amd-edac-mce_amd-add-new-mp5-nbio-and-pcie-smca-bank-types.patch
patches.arch/x86-mce-amd-edac-mce_amd-add-new-mcatypes-for-cs-psp-and-smu-units.patch
patches.arch/x86-mce-amd-edac-mce_amd-add-new-error-descriptions-for-some-smca-bank-types.patch