Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acc0b7c4 authored Jul 21, 2008 by Jiri Kosina

HID: remove quirk lookup from usbkbd/usbmouse



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>

parent 094403ce

drivers/hid/usbhid/usbkbd.c

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -233,14 +233,6 @@ static int usb_kbd_probe(struct usb_interface *iface,
	if (!usb_endpoint_is_int_in(endpoint))		if (!usb_endpoint_is_int_in(endpoint))
	return -ENODEV;		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);		pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));		maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));

drivers/hid/usbhid/usbmouse.c

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -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))		if (!usb_endpoint_is_int_in(endpoint))
	return -ENODEV;		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);		pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));		maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));