summarylogtreecommitdiffstats
path: root/0004-HID-multitouch-remove-unneeded-else-conditional-case.patch
diff options
context:
space:
mode:
authorJoey Pabalinas2018-06-30 17:35:15 -1000
committerJoey Pabalinas2018-06-30 17:35:15 -1000
commit7160ff9fc51814697dca5e99ae31cf60caf6d9c2 (patch)
tree78e1f3fb67712f71507458a89585f4dcffbe1216 /0004-HID-multitouch-remove-unneeded-else-conditional-case.patch
parentd14294613fbf2d3346ceaa17ba903bb985de541a (diff)
downloadaur-7160ff9fc51814697dca5e99ae31cf60caf6d9c2.tar.gz
upgpkg: linux-surfacepro3-git 4.18rc2.r298.g883c9ab9eb595f8542-1
upstream release
Diffstat (limited to '0004-HID-multitouch-remove-unneeded-else-conditional-case.patch')
-rw-r--r--0004-HID-multitouch-remove-unneeded-else-conditional-case.patch73
1 files changed, 73 insertions, 0 deletions
diff --git a/0004-HID-multitouch-remove-unneeded-else-conditional-case.patch b/0004-HID-multitouch-remove-unneeded-else-conditional-case.patch
new file mode 100644
index 00000000000..67b59e95f65
--- /dev/null
+++ b/0004-HID-multitouch-remove-unneeded-else-conditional-case.patch
@@ -0,0 +1,73 @@
+From d35643165a1d1972fd91e547922697a3c785a413 Mon Sep 17 00:00:00 2001
+Message-Id: <d35643165a1d1972fd91e547922697a3c785a413.1530402641.git.joeypabalinas@gmail.com>
+In-Reply-To: <cover.1530402641.git.joeypabalinas@gmail.com>
+References: <cover.1530402641.git.joeypabalinas@gmail.com>
+From: Joey Pabalinas <joeypabalinas@gmail.com>
+To: linux-input@vger.kernel.org
+CC: linux-kernel@vger.kernel.org
+CC: Jiri Kosina <jikos@kernel.org>
+CC: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+CC: Daniel Martin <consume.noise@gmail.com>
+CC: Joey Pabalinas <joeypabalinas@gmail.com>
+Date: Sat, 30 Jun 2018 13:34:22 -1000
+Subject: [PATCH 4/4] HID: multitouch: remove unneeded else conditional cases
+
+Elide lone `else` cases and replace `else if` clauses
+with plain `if` conditionals when they occur immediately
+after return statements.
+
+Signed-off-by: Joey Pabalinas <joeypabalinas@gmail.com>
+
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
+index 08b50e5908cecdda66..30b1a2c67f39a41325 100644
+--- a/drivers/hid/hid-multitouch.c
++++ b/drivers/hid/hid-multitouch.c
+@@ -205,12 +205,12 @@ static void mt_post_parse(struct mt_device *td);
+
+ static int cypress_compute_slot(struct mt_device *td)
+ {
+ if (td->curdata.contactid != 0 || td->num_received == 0)
+ return td->curdata.contactid;
+- else
+- return -1;
++
++ return -1;
+ }
+
+ static struct mt_class mt_classes[] = {
+ { .name = MT_CLS_DEFAULT,
+ .quirks = MT_QUIRK_ALWAYS_VALID |
+@@ -803,12 +803,12 @@ static int mt_compute_timestamp(struct mt_device *td, struct hid_field *field,
+ delta *= 100;
+
+ if (jdelta > MAX_TIMESTAMP_INTERVAL)
+ /* No data received for a while, resync the timestamp. */
+ return 0;
+- else
+- return td->timestamp + delta;
++
++ return td->timestamp + delta;
+ }
+
+ static int mt_touch_event(struct hid_device *hid, struct hid_field *field,
+ struct hid_usage *usage, __s32 value)
+ {
+@@ -1110,11 +1110,12 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+ * HID_DG_CONTACTCOUNT from the pen report as it is outside the physical
+ * collection, but within the report ID.
+ */
+ if (field->physical == HID_DG_STYLUS)
+ return 0;
+- else if ((field->physical == 0) &&
++
++ if ((field->physical == 0) &&
+ (field->report->id != td->mt_report_id) &&
+ (td->mt_report_id != -1))
+ return 0;
+
+ if (field->application == HID_DG_TOUCHSCREEN ||
+--
+2.18.0
+