Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...

[~andy/linux] / drivers / hid / hid-steelseries.c

diff --git a/drivers/hid/hid-steelseries.c b/drivers/hid/hid-steelseries.c
index 98e66ac718426cda87ae78cc2facaa97ca8543b8..9b0efb0083feaf4a1f258226aad0426c7b961721 100644 (file)
--- a/drivers/hid/hid-steelseries.c
+++ b/drivers/hid/hid-steelseries.c
@@ -377,16 +377,5 @@ static struct hid_driver steelseries_srws1_driver = {
        .report_fixup = steelseries_srws1_report_fixup
 };
 
-static int __init steelseries_srws1_init(void)
-{
-       return hid_register_driver(&steelseries_srws1_driver);
-}
-
-static void __exit steelseries_srws1_exit(void)
-{
-       hid_unregister_driver(&steelseries_srws1_driver);
-}
-
-module_init(steelseries_srws1_init);
-module_exit(steelseries_srws1_exit);
+module_hid_driver(steelseries_srws1_driver);
 MODULE_LICENSE("GPL");