Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / bluetooth / hidp / core.c

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index d478be1..2c20d76 100644 (file)
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -1195,41 +1195,16 @@ int hidp_get_conninfo(struct hidp_conninfo *ci)
        return err;
 }
 
-static const struct hid_device_id hidp_table[] = {
-       { HID_BLUETOOTH_DEVICE(HID_ANY_ID, HID_ANY_ID) },
-       { }
-};
-
-static struct hid_driver hidp_driver = {
-       .name = "generic-bluetooth",
-       .id_table = hidp_table,
-};
-
 static int __init hidp_init(void)
 {
-       int ret;
-
        BT_INFO("HIDP (Human Interface Emulation) ver %s", VERSION);
 
-       ret = hid_register_driver(&hidp_driver);
-       if (ret)
-               goto err;
-
-       ret = hidp_init_sockets();
-       if (ret)
-               goto err_drv;
-
-       return 0;
-err_drv:
-       hid_unregister_driver(&hidp_driver);
-err:
-       return ret;
+       return hidp_init_sockets();
 }
 
 static void __exit hidp_exit(void)
 {
        hidp_cleanup_sockets();
-       hid_unregister_driver(&hidp_driver);
 }
 
 module_init(hidp_init);