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: Henrik Rydberg <rydberg@euromail.se>
Acked-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

2 files changed, 2 insertions, 9 deletions

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 20daee56d325..cb5a10337541 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1800,14 +1800,7 @@ static int hid_bus_match(struct device *dev, struct device_driver *drv)
                 !strncmp(hdrv->name, "hid-multitouch", 14))
                 return 1;
 
-        if (!hid_match_device(hdev, hdrv))
-                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;
+        return hid_match_device(hdev, hdrv) != NULL;
 }
 
 static int hid_device_probe(struct device *dev)
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 5bf91dbad59d..9abf718318ca 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -1505,7 +1505,7 @@ static struct usb_driver hid_driver = {
 };
 
 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) },
         { }
 };