Merge branch 'cleanup' into for-linus

[deliverable/linux.git] / drivers / hid / hid-tivo.c

diff --git a/drivers/hid/hid-tivo.c b/drivers/hid/hid-tivo.c
index 9f85f827607fd6fca72b03152ca7a51b061ec82c..d790d8d71f7fc6829f405b7665cc37f0af1bf5a8 100644 (file)
--- a/drivers/hid/hid-tivo.c
+++ b/drivers/hid/hid-tivo.c
@@ -73,18 +73,7 @@ static struct hid_driver tivo_driver = {
        .id_table = tivo_devices,
        .input_mapping = tivo_input_mapping,
 };
+module_hid_driver(tivo_driver);
 
-static int __init tivo_init(void)
-{
-       return hid_register_driver(&tivo_driver);
-}
-
-static void __exit tivo_exit(void)
-{
-       hid_unregister_driver(&tivo_driver);
-}
-
-module_init(tivo_init);
-module_exit(tivo_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jarod Wilson <jarod@redhat.com>");