diff options
| -rw-r--r-- | drivers/hid/hid-core.c | 4 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 2 | ||||
| -rw-r--r-- | drivers/hid/hid-microsoft.c | 4 | ||||
| -rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 2 |
4 files changed, 0 insertions, 12 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index db87d918efca..1ff9142fe0c4 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -727,8 +727,6 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) | |||
| 727 | (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 || | 727 | (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 || |
| 728 | hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 || | 728 | hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 || |
| 729 | hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP || | 729 | hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP || |
| 730 | hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 || | ||
| 731 | hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 || | ||
| 732 | hid->product == USB_DEVICE_ID_MS_POWER_COVER) && | 730 | hid->product == USB_DEVICE_ID_MS_POWER_COVER) && |
| 733 | hid->group == HID_GROUP_MULTITOUCH) | 731 | hid->group == HID_GROUP_MULTITOUCH) |
| 734 | hid->group = HID_GROUP_GENERIC; | 732 | hid->group = HID_GROUP_GENERIC; |
| @@ -1987,8 +1985,6 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 1987 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) }, | 1985 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) }, |
| 1988 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) }, | 1986 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) }, |
| 1989 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) }, | 1987 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) }, |
| 1990 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4) }, | ||
| 1991 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2) }, | ||
| 1992 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) }, | 1988 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) }, |
| 1993 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) }, | 1989 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) }, |
| 1994 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) }, | 1990 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 55758f7f88fb..9d8771617779 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -721,8 +721,6 @@ | |||
| 721 | #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc | 721 | #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc |
| 722 | #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 0x07e2 | 722 | #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 0x07e2 |
| 723 | #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd | 723 | #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd |
| 724 | #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 0x07e4 | ||
| 725 | #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 0x07e8 | ||
| 726 | #define USB_DEVICE_ID_MS_POWER_COVER 0x07da | 724 | #define USB_DEVICE_ID_MS_POWER_COVER 0x07da |
| 727 | 725 | ||
| 728 | #define USB_VENDOR_ID_MOJO 0x8282 | 726 | #define USB_VENDOR_ID_MOJO 0x8282 |
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index 2b706b51bec3..d856726e7ed2 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c | |||
| @@ -280,10 +280,6 @@ static const struct hid_device_id ms_devices[] = { | |||
| 280 | .driver_data = MS_HIDINPUT }, | 280 | .driver_data = MS_HIDINPUT }, |
| 281 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP), | 281 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP), |
| 282 | .driver_data = MS_HIDINPUT }, | 282 | .driver_data = MS_HIDINPUT }, |
| 283 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4), | ||
| 284 | .driver_data = MS_HIDINPUT }, | ||
| 285 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2), | ||
| 286 | .driver_data = MS_HIDINPUT }, | ||
| 287 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), | 283 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), |
| 288 | .driver_data = MS_HIDINPUT }, | 284 | .driver_data = MS_HIDINPUT }, |
| 289 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD), | 285 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD), |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index ebb8e95c46ab..6108649a5f76 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
| @@ -103,8 +103,6 @@ static const struct hid_blacklist { | |||
| 103 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3, HID_QUIRK_NO_INIT_REPORTS }, | 103 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3, HID_QUIRK_NO_INIT_REPORTS }, |
| 104 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2, HID_QUIRK_NO_INIT_REPORTS }, | 104 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2, HID_QUIRK_NO_INIT_REPORTS }, |
| 105 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS }, | 105 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS }, |
| 106 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4, HID_QUIRK_NO_INIT_REPORTS }, | ||
| 107 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2, HID_QUIRK_NO_INIT_REPORTS }, | ||
| 108 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS }, | 106 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS }, |
| 109 | { USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS }, | 107 | { USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS }, |
| 110 | { USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS }, | 108 | { USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS }, |
