Commit 6212aae0 authored Nov 02, 2015 by Jason Gerecke Committed by Jiri Kosina Nov 03, 2015

HID: wacom: Remove useless conditions from 'wacom_query_tablet_data'

When support for the Cintiq Companion Hybrid and Cintiq Companion 2 was
added (36d3c510 and f7acb55c), the 'wacom_query_tablet_data' function was
updated to include references to CINTIQ_HYBRID and CINTIQ_COMPANION_2
with the thought that they were necessary to switch the touch interface
into the proper mode. This is unnecessary, however, since those types
are only ever associated with the pen interface -- the touch interfaces
are either CINTIQ_24HDT or HID_GENERIC. To avoid confusion in the future,
we remove the unnecessary CINTIQ_HYBRID and CINTIQ_COMPANION_2 conditions.

Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent 7adb91bd

drivers/hid/wacom_sys.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -422,7 +422,7 @@ static int wacom_query_tablet_data(struct hid_device *hdev,
		/* MT Tablet PC touch */
		return wacom_set_device_mode(hdev, 3, 4, 4);
		}
		else if (features->type == WACOM_24HDT \|\| features->type == CINTIQ_HYBRID \|\| features->type == CINTIQ_COMPANION_2) {
		else if (features->type == WACOM_24HDT) {
		return wacom_set_device_mode(hdev, 18, 3, 2);
		}
		else if (features->type == WACOM_27QHDT) {

Admin message