HID: Create a common generic driver

Move the hid drivers of the bus drivers to a common generic hid
driver, and make it a proper module. This ought to simplify device
handling moving forward.

Cc: Gustavo Padovan <gustavo@padovan.org>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 0 insertions, 16 deletions

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 9abf718318ca..9cba5006b5ed 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -1504,28 +1504,15 @@ static struct usb_driver hid_driver = {
         .supports_autosuspend = 1,
 };
 
-static const struct hid_device_id hid_usb_table[] = {
-        { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, HID_ANY_ID, HID_ANY_ID) },
-        { }
-};
-
 struct usb_interface *usbhid_find_interface(int minor)
 {
         return usb_find_interface(&hid_driver, minor);
 }
 
-static struct hid_driver hid_usb_driver = {
-        .name = "generic-usb",
-        .id_table = hid_usb_table,
-};
-
 static int __init hid_init(void)
 {
         int retval = -ENOMEM;
 
-        retval = hid_register_driver(&hid_usb_driver);
-        if (retval)
-                goto hid_register_fail;
         retval = usbhid_quirks_init(quirks_param);
         if (retval)
                 goto usbhid_quirks_init_fail;
@@ -1538,8 +1525,6 @@ static int __init hid_init(void)
 usb_register_fail:
         usbhid_quirks_exit();
 usbhid_quirks_init_fail:
-        hid_unregister_driver(&hid_usb_driver);
-hid_register_fail:
         return retval;
 }
 
@@ -1547,7 +1532,6 @@ static void __exit hid_exit(void)
 {
         usb_deregister(&hid_driver);
         usbhid_quirks_exit();
-        hid_unregister_driver(&hid_usb_driver);
 }
 
 module_init(hid_init);