Commit 070748ed authored by Henrik Rydberg's avatar Henrik Rydberg Committed by Jiri Kosina

HID: Create a generic device group

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: default avatarHenrik Rydberg <rydberg@euromail.se>
Acked-by: default avatarBenjamin Tissoires <benjamin.tissoires@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 7431fb76
...@@ -1800,14 +1800,7 @@ static int hid_bus_match(struct device *dev, struct device_driver *drv) ...@@ -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)
......
...@@ -1505,7 +1505,7 @@ static struct usb_driver hid_driver = { ...@@ -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) },
{ } { }
}; };
......
...@@ -586,12 +586,12 @@ struct hid_descriptor { ...@@ -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)
......
...@@ -1196,7 +1196,7 @@ int hidp_get_conninfo(struct hidp_conninfo *ci) ...@@ -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) },
{ } { }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment