Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 15:40:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HID: Create a generic device group

Browse Source 
Devices that do not have a special driver are handled by the generic
driver. This patch does the same thing using device groups; Instead of
forcing a particular driver, the appropriate driver is picked up by
udev. As a consequence, one can now move a device from generic to
specific handling by a simple rebind. By adding a new device id to the
generic driver, the same thing can be done in reverse.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Acked-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Henrik Rydberg 2012-04-23 12:07:05 +02:00 committed by Jiri Kosina
parent 7431fb767d
commit 070748ed0b
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/hid/hid-core.c
View File

@ -1800,14 +1800,7 @@ static int hid_bus_match(struct device *dev, struct device_driver *drv)
!strncmp(hdrv->name, "hid-multitouch", 14)) !strncmp(hdrv->name, "hid-multitouch", 14))
return 1; return 1;
if (!hid_match_device(hdev, hdrv)) return hid_match_device(hdev, hdrv) != NULL;
return 0;
/* generic wants all that don't have specialized driver */
if (!strncmp(hdrv->name, "generic-", 8) && !hid_ignore_special_drivers)
return !hid_match_id(hdev, hid_have_special_driver);
return 1;
} }
static int hid_device_probe(struct device *dev) static int hid_device_probe(struct device *dev)

2
drivers/hid/usbhid/hid-core.c
View File

@ -1505,7 +1505,7 @@ static struct usb_driver hid_driver = {
}; };
static const struct hid_device_id hid_usb_table[] = { static const struct hid_device_id hid_usb_table[] = {
{ HID_USB_DEVICE(HID_ANY_ID, HID_ANY_ID) }, { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, HID_ANY_ID, HID_ANY_ID) },
{ } { }
}; };

12
include/linux/hid.h
View File

@ -586,12 +586,12 @@ struct hid_descriptor {
struct hid_class_descriptor desc[1]; struct hid_class_descriptor desc[1];
} __attribute__ ((packed)); } __attribute__ ((packed));
#define HID_DEVICE(b, ven, prod) \ #define HID_DEVICE(b, g, ven, prod) \
.bus = (b), \ .bus = (b), .group = (g), .vendor = (ven), .product = (prod)
.vendor = (ven), .product = (prod) #define HID_USB_DEVICE(ven, prod) \
.bus = BUS_USB, .vendor = (ven), .product = (prod)
#define HID_USB_DEVICE(ven, prod) HID_DEVICE(BUS_USB, ven, prod) #define HID_BLUETOOTH_DEVICE(ven, prod) \
#define HID_BLUETOOTH_DEVICE(ven, prod) HID_DEVICE(BUS_BLUETOOTH, ven, prod) .bus = BUS_BLUETOOTH, .vendor = (ven), .product = (prod)
#define HID_REPORT_ID(rep) \ #define HID_REPORT_ID(rep) \
.report_type = (rep) .report_type = (rep)

2
net/bluetooth/hidp/core.c
View File

@ -1196,7 +1196,7 @@ int hidp_get_conninfo(struct hidp_conninfo *ci)
} }
static const struct hid_device_id hidp_table[] = { static const struct hid_device_id hidp_table[] = {
{ HID_BLUETOOTH_DEVICE(HID_ANY_ID, HID_ANY_ID) }, { HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_GENERIC, HID_ANY_ID, HID_ANY_ID) },
{ } { }
}; };