Commit 27a6f701 authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Benjamin Tissoires
Browse files

HID: multitouch: Remove MT_CLS_WIN_8_DUAL 



After commit c23e2043 ("HID: multitouch: do not filter mice nodes"),
MT_CLS_WIN_8 also supports mouse nodes, hence make MT_CLS_WIN_8_DUAL
redundant.

Remove MT_CLS_WIN_8_DUAL accordingly.

Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent 40d5bb87

drivers/hid/hid-ids.h

+0 −8
Original line number Diff line number Diff line
@@ -76,12 +76,9 @@ 


#define USB_VENDOR_ID_ALPS_JP		0x044E

#define HID_DEVICE_ID_ALPS_U1_DUAL	0x120B

#define HID_DEVICE_ID_ALPS_U1_DUAL_PTP	0x121F

#define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP	0x1220

#define HID_DEVICE_ID_ALPS_U1		0x1215

#define HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY         0x121E

#define HID_DEVICE_ID_ALPS_T4_BTNLESS	0x120C

#define HID_DEVICE_ID_ALPS_1222		0x1222



#define USB_VENDOR_ID_AMI		0x046b

#define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE	0xff10
@@ -281,9 +278,6 @@ 


#define USB_VENDOR_ID_CIDC		0x1677



#define I2C_VENDOR_ID_CIRQUE		0x0488

#define I2C_PRODUCT_ID_CIRQUE_121F	0x121F



#define USB_VENDOR_ID_CJTOUCH		0x24b8

#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020	0x0020

#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040	0x0040
@@ -730,8 +724,6 @@ 
#define USB_DEVICE_ID_LENOVO_SCROLLPOINT_OPTICAL	0x6049

#define USB_DEVICE_ID_LENOVO_TPPRODOCK	0x6067

#define USB_DEVICE_ID_LENOVO_X1_COVER	0x6085

#define USB_DEVICE_ID_LENOVO_X1_TAB	0x60a3

#define USB_DEVICE_ID_LENOVO_X1_TAB3	0x60b5

#define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D	0x608d



#define USB_VENDOR_ID_LG		0x1fd2

drivers/hid/hid-multitouch.c

+2 −42
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app); 
/* reserved					0x0011 */

#define MT_CLS_WIN_8				0x0012

#define MT_CLS_EXPORT_ALL_INPUTS		0x0013

#define MT_CLS_WIN_8_DUAL			0x0014

/* reserved					0x0014 */

#define MT_CLS_WIN_8_FORCE_MULTI_INPUT		0x0015



/* vendor specific classes */
@@ -274,13 +274,6 @@ static const struct mt_class mt_classes[] = { 
		.quirks = MT_QUIRK_ALWAYS_VALID |

			MT_QUIRK_CONTACT_CNT_ACCURATE,

		.export_all_inputs = true },

	{ .name = MT_CLS_WIN_8_DUAL,

		.quirks = MT_QUIRK_ALWAYS_VALID |

			MT_QUIRK_IGNORE_DUPLICATES |

			MT_QUIRK_HOVERING |

			MT_QUIRK_CONTACT_CNT_ACCURATE |

			MT_QUIRK_WIN8_PTP_BUTTONS,

		.export_all_inputs = true },

	{ .name = MT_CLS_WIN_8_FORCE_MULTI_INPUT,

		.quirks = MT_QUIRK_ALWAYS_VALID |

			MT_QUIRK_IGNORE_DUPLICATES |
@@ -765,8 +758,7 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
			MT_STORE_FIELD(inrange_state);

			return 1;

		case HID_DG_CONFIDENCE:

			if ((cls->name == MT_CLS_WIN_8 ||

				cls->name == MT_CLS_WIN_8_DUAL) &&

			if (cls->name == MT_CLS_WIN_8 &&

				(field->application == HID_DG_TOUCHPAD ||

				 field->application == HID_DG_TOUCHSCREEN))

				app->quirks |= MT_QUIRK_CONFIDENCE;
@@ -1802,32 +1794,6 @@ static const struct hid_device_id mt_devices[] = { 
		MT_USB_DEVICE(USB_VENDOR_ID_3M,

			USB_DEVICE_ID_3M3266) },



	/* Alps devices */

	{ .driver_data = MT_CLS_WIN_8_DUAL,

		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,

			USB_VENDOR_ID_ALPS_JP,

			HID_DEVICE_ID_ALPS_U1_DUAL_PTP) },

	{ .driver_data = MT_CLS_WIN_8_DUAL,

		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,

			USB_VENDOR_ID_ALPS_JP,

			HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) },

	{ .driver_data = MT_CLS_WIN_8_DUAL,

		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,

			USB_VENDOR_ID_ALPS_JP,

			HID_DEVICE_ID_ALPS_1222) },



	/* Lenovo X1 TAB Gen 2 */

	{ .driver_data = MT_CLS_WIN_8_DUAL,

		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,

			   USB_VENDOR_ID_LENOVO,

			   USB_DEVICE_ID_LENOVO_X1_TAB) },



	/* Lenovo X1 TAB Gen 3 */

	{ .driver_data = MT_CLS_WIN_8_DUAL,

		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,

			   USB_VENDOR_ID_LENOVO,

			   USB_DEVICE_ID_LENOVO_X1_TAB3) },



	/* Anton devices */

	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,

		MT_USB_DEVICE(USB_VENDOR_ID_ANTON,
@@ -1862,12 +1828,6 @@ static const struct hid_device_id mt_devices[] = { 
		MT_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT,

			USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },



	/* Cirque devices */

	{ .driver_data = MT_CLS_WIN_8_DUAL,

		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,

			I2C_VENDOR_ID_CIRQUE,

			I2C_PRODUCT_ID_CIRQUE_121F) },



	/* CJTouch panels */

	{ .driver_data = MT_CLS_NSMU,

		MT_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,

CRA Git | Maintained and supported by SUSTech CRA and CCSE