Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and 'sched-urgent...

[~andy/linux] / drivers / media / radio / radio-mr800.c

diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index 1742bd8110bdb3b28b175dcd2e9613e6aba9e189..a860a72a58ecc39c7a37d2a5f36e87c2bedad161 100644 (file)
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -659,25 +659,4 @@ err:
        return retval;
 }
 
-static int __init amradio_init(void)
-{
-       int retval = usb_register(&usb_amradio_driver);
-
-       pr_info(KBUILD_MODNAME
-               ": version " DRIVER_VERSION " " DRIVER_DESC "\n");
-
-       if (retval)
-               pr_err(KBUILD_MODNAME
-                       ": usb_register failed. Error number %d\n", retval);
-
-       return retval;
-}
-
-static void __exit amradio_exit(void)
-{
-       usb_deregister(&usb_amradio_driver);
-}
-
-module_init(amradio_init);
-module_exit(amradio_exit);
-
+module_usb_driver(usb_amradio_driver);