Skip to content

Commit 739ca58

Browse files
archseerqzed
archseer
authored and
qzed
committed
Revert "HID: quirks for Microsoft Surface devices"
This reverts commit 8902494.
1 parent dbb20f8 commit 739ca58

4 files changed

Lines changed: 7 additions & 86 deletions

File tree

‎drivers/hid/hid-ids.h‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -804,22 +804,12 @@
804804
#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1 0x0732
805805
#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_600 0x0750
806806
#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c
807-
#define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3
808-
#define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799
809-
#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
810-
#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
811-
#define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07de
812-
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc
813-
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1 0x07de
814-
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 0x07e2
815-
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd
816-
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 0x07e8
817-
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1 0x07e4
818-
#define USB_DEVICE_ID_MS_SURFACE_BOOK 0x07cd
819-
#define USB_DEVICE_ID_MS_SURFACE_BOOK_2 0x0922
820-
#define USB_DEVICE_ID_MS_SURFACE_GO 0x096f
821-
#define USB_DEVICE_ID_MS_SURFACE_VHF 0xf001
822-
#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
807+
#define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3
808+
#define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799
809+
#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
810+
#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
811+
#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
812+
#define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER 0x02fd
823813
#define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb
824814

825815
#define USB_VENDOR_ID_MOJO 0x8282

‎drivers/hid/hid-microsoft.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,7 @@ static const struct hid_device_id ms_devices[] = {
313313
.driver_data = MS_HIDINPUT },
314314
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),
315315
.driver_data = MS_ERGONOMY},
316-
{ HID_DEVICE(BUS_VIRTUAL, 0, USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_VHF),
317-
.driver_data = MS_HIDINPUT},
316+
318317
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),
319318
.driver_data = MS_PRESENTER },
320319
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B),

‎drivers/hid/hid-multitouch.c‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,63 +1989,6 @@ static const struct hid_device_id mt_devices[] = {
19891989
HID_USB_DEVICE(USB_VENDOR_ID_LG,
19901990
USB_DEVICE_ID_LG_MELFAS_MT) },
19911991

1992-
/* Microsoft Touch Cover */
1993-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
1994-
MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
1995-
USB_DEVICE_ID_MS_TOUCH_COVER_2) },
1996-
1997-
/* Microsoft Type Cover */
1998-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
1999-
MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
2000-
USB_DEVICE_ID_MS_TYPE_COVER_2) },
2001-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
2002-
MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
2003-
USB_DEVICE_ID_MS_TYPE_COVER_3) },
2004-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
2005-
MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
2006-
USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },
2007-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
2008-
MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
2009-
USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1) },
2010-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
2011-
MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
2012-
USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },
2013-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
2014-
MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
2015-
USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },
2016-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
2017-
MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
2018-
USB_DEVICE_ID_MS_TYPE_COVER_PRO_4) },
2019-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
2020-
MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
2021-
USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1) },
2022-
2023-
/* Microsoft Surface Book */
2024-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
2025-
MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
2026-
USB_DEVICE_ID_MS_SURFACE_BOOK) },
2027-
2028-
/* Microsoft Surface Book 2 */
2029-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
2030-
MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
2031-
USB_DEVICE_ID_MS_SURFACE_BOOK_2) },
2032-
2033-
/* Microsoft Surface Go */
2034-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
2035-
MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
2036-
USB_DEVICE_ID_MS_SURFACE_GO) },
2037-
2038-
/* Microsoft Surface Laptop */
2039-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
2040-
HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
2041-
USB_VENDOR_ID_MICROSOFT,
2042-
USB_DEVICE_ID_MS_SURFACE_VHF) },
2043-
2044-
/* Microsoft Power Cover */
2045-
{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
2046-
MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
2047-
USB_DEVICE_ID_MS_POWER_COVER) },
2048-
20491992
/* MosArt panels */
20501993
{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
20511994
MT_USB_DEVICE(USB_VENDOR_ID_ASUS,

‎drivers/hid/hid-quirks.c‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,6 @@ static const struct hid_device_id hid_quirks[] = {
114114
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2), HID_QUIRK_NO_INIT_REPORTS },
115115
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
116116
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
117-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3), HID_QUIRK_NO_INIT_REPORTS },
118-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3), HID_QUIRK_NO_INIT_REPORTS },
119-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1), HID_QUIRK_NO_INIT_REPORTS },
120-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2), HID_QUIRK_NO_INIT_REPORTS },
121-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP), HID_QUIRK_NO_INIT_REPORTS },
122-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4), HID_QUIRK_NO_INIT_REPORTS },
123-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1), HID_QUIRK_NO_INIT_REPORTS },
124-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK), HID_QUIRK_NO_INIT_REPORTS },
125-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK_2), HID_QUIRK_NO_INIT_REPORTS },
126-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_GO), HID_QUIRK_NO_INIT_REPORTS },
127-
{ HID_DEVICE(BUS_VIRTUAL, 0, USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_VHF), HID_QUIRK_ALWAYS_POLL },
128117
{ HID_USB_DEVICE(USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER), HID_QUIRK_MULTI_INPUT },
129118
{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL), HID_QUIRK_NO_INIT_REPORTS },
130119
{ HID_USB_DEVICE(USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD), HID_QUIRK_MULTI_INPUT },

0 commit comments

Comments
 (0)