Revert "USB: Add device quirk for ASUS T100 Base Station keyboard"

This reverts commit eea5a87d270e8d6925063019c3b0f3ff61fcb49a.

Conflicts:
	drivers/usb/core/quirks.c
	include/linux/usb/quirks.h

Signed-off-by: Zefan Li <lizefan@huawei.com>

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index e0ad5dc214b362cbbc9fe1634a5b446e2932a6be..65ff69a05225d5de3b070e403128744d0bfd854e 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1655,10 +1655,8 @@ void usb_set_device_state(struct usb_device *udev,
                                        || new_state == USB_STATE_SUSPENDED)
                                ;       /* No change to wakeup settings */
                        else if (new_state == USB_STATE_CONFIGURED)
-                               wakeup = (udev->quirks &
-                                       USB_QUIRK_IGNORE_REMOTE_WAKEUP) ? 0 :
-                                       udev->actconfig->desc.bmAttributes &
-                                       USB_CONFIG_ATT_WAKEUP;
+                               wakeup = udev->actconfig->desc.bmAttributes
+                                        & USB_CONFIG_ATT_WAKEUP;
                        else
                                wakeup = 0;
                }

diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index fd8e60ee7df285fc6943accdc2f2f3de545c4293..32e08dcc4354ee88c1ff31d0607a6f9055128a66 100644 (file)
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -184,10 +184,6 @@ static const struct usb_device_id usb_interface_quirk_list[] = {
        { USB_VENDOR_AND_INTERFACE_INFO(0x046d, USB_CLASS_VIDEO, 1, 0),
          .driver_info = USB_QUIRK_RESET_RESUME },
 
-       /* ASUS Base Station(T100) */
-       { USB_DEVICE(0x0b05, 0x17e0), .driver_info =
-                       USB_QUIRK_IGNORE_REMOTE_WAKEUP },
-
        /* Protocol and OTG Electrical Test Device */
        { USB_DEVICE(0x1a0a, 0x0200), .driver_info =
                        USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL },

diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h
index 0972470bb072b362289e5b68cdc2d77cd6cf1f61..a67e7d13008b773c4a34cd0c4316fd48c6350347 100644 (file)
--- a/include/linux/usb/quirks.h
+++ b/include/linux/usb/quirks.h
@@ -30,9 +30,6 @@
    descriptor */
 #define USB_QUIRK_DELAY_INIT           0x00000040
 
-/* device generates spurious wakeup, ignore remote wakeup capability */
-#define USB_QUIRK_IGNORE_REMOTE_WAKEUP 0x00000200
-
 /* device can't handle device_qualifier descriptor requests */
 #define USB_QUIRK_DEVICE_QUALIFIER     0x00000100