Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-bionic-kernel.git] / drivers / hid / uhid.c

diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index 99ec3ff7563b3e75ce0c050ba7d28064d445c7af..7f8ff39ed44bd7900f006956b001e57f93c22143 100644 (file)
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -779,19 +779,8 @@ static struct miscdevice uhid_misc = {
        .minor          = UHID_MINOR,
        .name           = UHID_NAME,
 };
+module_misc_device(uhid_misc);
 
-static int __init uhid_init(void)
-{
-       return misc_register(&uhid_misc);
-}
-
-static void __exit uhid_exit(void)
-{
-       misc_deregister(&uhid_misc);
-}
-
-module_init(uhid_init);
-module_exit(uhid_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Herrmann <dh.herrmann@gmail.com>");
 MODULE_DESCRIPTION("User-space I/O driver support for HID subsystem");