From 3248eb3e7c752015fd7070cdd66006492061e02c Mon Sep 17 00:00:00 2001 From: Jake Day Date: Fri, 3 Nov 2017 21:15:33 -0400 Subject: [PATCH] cleanup surface laptop keyboard hid ids --- kernel/drivers/hid/hid-core.c | 2 -- kernel/drivers/hid/hid-ids.h | 3 +-- kernel/drivers/hid/hid-microsoft.c | 2 -- kernel/drivers/hid/usbhid/hid-quirks.c | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/kernel/drivers/hid/hid-core.c b/kernel/drivers/hid/hid-core.c index 6c9b84972..fd7518207 100644 --- a/kernel/drivers/hid/hid-core.c +++ b/kernel/drivers/hid/hid-core.c @@ -724,7 +724,6 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) if (hid->vendor == USB_VENDOR_ID_MICROSOFT && (hid->product == USB_DEVICE_ID_MS_SURFACE_LAPTOP || - hid->product == USB_DEVICE_ID_MS_SURFACE_LAPTOP || hid->product == USB_DEVICE_ID_MS_POWER_COVER) && hid->group == HID_GROUP_MULTITOUCH) hid->group = HID_GROUP_GENERIC; @@ -2182,7 +2181,6 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_LAPTOP) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_LAPTOP_2) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) }, #endif diff --git a/kernel/drivers/hid/hid-ids.h b/kernel/drivers/hid/hid-ids.h index 5e33d97d6..e011419cc 100644 --- a/kernel/drivers/hid/hid-ids.h +++ b/kernel/drivers/hid/hid-ids.h @@ -769,8 +769,7 @@ #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 0x07e8 #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1 0x07e4 #define USB_DEVICE_ID_MS_SURFACE_BOOK 0x07cd -#define USB_DEVICE_ID_MS_SURFACE_LAPTOP 0x0904 -#define USB_DEVICE_ID_MS_SURFACE_LAPTOP_2 0xf001 +#define USB_DEVICE_ID_MS_SURFACE_LAPTOP 0xf001 #define USB_DEVICE_ID_MS_POWER_COVER 0x07da #define USB_VENDOR_ID_MOJO 0x8282 diff --git a/kernel/drivers/hid/hid-microsoft.c b/kernel/drivers/hid/hid-microsoft.c index 708c5bb02..9127164be 100644 --- a/kernel/drivers/hid/hid-microsoft.c +++ b/kernel/drivers/hid/hid-microsoft.c @@ -276,8 +276,6 @@ static const struct hid_device_id ms_devices[] = { .driver_data = MS_DUPLICATE_USAGES }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_LAPTOP), .driver_data = MS_HIDINPUT }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_LAPTOP_2), - .driver_data = MS_HIDINPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), .driver_data = MS_HIDINPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD), diff --git a/kernel/drivers/hid/usbhid/hid-quirks.c b/kernel/drivers/hid/usbhid/hid-quirks.c index 80f68b895..7b4812094 100644 --- a/kernel/drivers/hid/usbhid/hid-quirks.c +++ b/kernel/drivers/hid/usbhid/hid-quirks.c @@ -119,7 +119,6 @@ static const struct hid_blacklist { { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_LAPTOP, HID_QUIRK_NO_INIT_REPORTS }, - { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_LAPTOP_2, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS },