Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf5af9b5 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: hid-multitouch: class MT_CLS_STANTUM is redundant with MT_CLS_CONFIDENCE 



Stantum devices used to work with MT_CLS_STANTUM but MT_CLS_CONFIDENCE
is exactly the same. This patch switches them to this generic class,
and remove the unused MT_CLS_STANTUM.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@enac.fr>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 617b64f9

drivers/hid/hid-multitouch.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -88,7 +88,6 @@ struct mt_class { 
#define MT_CLS_DUAL_INRANGE_CONTACTNUMBER	3

#define MT_CLS_DUAL_INRANGE_CONTACTNUMBER	3

#define MT_CLS_CYPRESS				4

#define MT_CLS_CYPRESS				4

#define MT_CLS_EGALAX				5

#define MT_CLS_EGALAX				5

#define MT_CLS_STANTUM				6

#define MT_CLS_3M				7

#define MT_CLS_3M				7

#define MT_CLS_CONFIDENCE			8

#define MT_CLS_CONFIDENCE			8

#define MT_CLS_CONFIDENCE_MINUS_ONE		9

#define MT_CLS_CONFIDENCE_MINUS_ONE		9
@@ -154,8 +153,6 @@ struct mt_class mt_classes[] = { 
		.sn_move = 4096,

		.sn_move = 4096,

		.sn_pressure = 32,

		.sn_pressure = 32,

	},

	},

	{ .name = MT_CLS_STANTUM,

		.quirks = MT_QUIRK_VALID_IS_CONFIDENCE },

	{ .name = MT_CLS_3M,

	{ .name = MT_CLS_3M,

		.quirks = MT_QUIRK_VALID_IS_CONFIDENCE |

		.quirks = MT_QUIRK_VALID_IS_CONFIDENCE |

			MT_QUIRK_SLOT_IS_CONTACTID,

			MT_QUIRK_SLOT_IS_CONTACTID,
@@ -673,13 +670,13 @@ static const struct hid_device_id mt_devices[] = { 
			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },





	/* Stantum panels */

	/* Stantum panels */

	{ .driver_data = MT_CLS_STANTUM,

	{ .driver_data = MT_CLS_CONFIDENCE,

		HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,

		HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,

			USB_DEVICE_ID_MTP)},

			USB_DEVICE_ID_MTP)},

	{ .driver_data = MT_CLS_STANTUM,

	{ .driver_data = MT_CLS_CONFIDENCE,

		HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,

		HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,

			USB_DEVICE_ID_MTP_STM)},

			USB_DEVICE_ID_MTP_STM)},

	{ .driver_data = MT_CLS_STANTUM,

	{ .driver_data = MT_CLS_CONFIDENCE,

		HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,

		HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,

			USB_DEVICE_ID_MTP_SITRONIX)},

			USB_DEVICE_ID_MTP_SITRONIX)},