HID: remove quirk lookup from usbkbd/usbmouse
Jiri Kosina [Mon, 21 Jul 2008 16:30:05 +0000 (18:30 +0200)]
This patch completely removes the dependency of usbkbd and usbmouse drivers
on usbhid code.

usbkbd/usbmouse drivers are not needed in the vast majority of cases anyway,
and they shouldn't be loaded in standard configurations at all. They are supposed
to be as trivial as possible, and searching for HID_QUIRK_IGNORE can even be
bad in some cases.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

drivers/hid/usbhid/usbkbd.c
drivers/hid/usbhid/usbmouse.c

index d7212ac..0caaafe 100644 (file)
@@ -233,14 +233,6 @@ static int usb_kbd_probe(struct usb_interface *iface,
        if (!usb_endpoint_is_int_in(endpoint))
                return -ENODEV;
 
-#ifdef CONFIG_USB_HID_MODULE
-       if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
-                               le16_to_cpu(dev->descriptor.idProduct))
-                       & HID_QUIRK_IGNORE) {
-               return -ENODEV;
-       }
-#endif
-
        pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
        maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
 
index f74740f..35689ef 100644 (file)
@@ -129,14 +129,6 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
        if (!usb_endpoint_is_int_in(endpoint))
                return -ENODEV;
 
-#ifdef CONFIG_USB_HID_MODULE
-       if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
-                               le16_to_cpu(dev->descriptor.idProduct))
-                       & (HID_QUIRK_IGNORE|HID_QUIRK_IGNORE_MOUSE)) {
-               return -ENODEV;
-       }
-#endif
-
        pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
        maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));