Merge remote-tracking branch 'v4.4/topic/mm-kaslr-pax_usercopy' into linux-linaro...

[firefly-linux-kernel-4.4.55.git] / drivers / hid / hid-topseed.c

diff --git a/drivers/hid/hid-topseed.c b/drivers/hid/hid-topseed.c
index 613ff7b1d746a0d51d56dca6e17e2cc2e0e1e7dc..8a5b843e9dd6f904618ff790c872d48ff07a2aea 100644 (file)
--- a/drivers/hid/hid-topseed.c
+++ b/drivers/hid/hid-topseed.c
@@ -76,17 +76,6 @@ static struct hid_driver ts_driver = {
        .id_table = ts_devices,
        .input_mapping = ts_input_mapping,
 };
+module_hid_driver(ts_driver);
 
-static int __init ts_init(void)
-{
-       return hid_register_driver(&ts_driver);
-}
-
-static void __exit ts_exit(void)
-{
-       hid_unregister_driver(&ts_driver);
-}
-
-module_init(ts_init);
-module_exit(ts_exit);
 MODULE_LICENSE("GPL");