Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mirror_ubuntu-artful-kernel.git] / drivers / media / dvb / dvb-usb / mxl111sf.c

diff --git a/drivers/media/dvb/dvb-usb/mxl111sf.c b/drivers/media/dvb/dvb-usb/mxl111sf.c
index 34e6f8d94dc2faba1c63caa28574adfd190c243e..38ef0253d3b5b9c79aa1daade821f241f90e6800 100644 (file)
--- a/drivers/media/dvb/dvb-usb/mxl111sf.c
+++ b/drivers/media/dvb/dvb-usb/mxl111sf.c
@@ -1047,24 +1047,7 @@ static struct usb_driver mxl111sf_driver = {
        .id_table       = mxl111sf_table,
 };
 
-static int __init mxl111sf_module_init(void)
-{
-       int result = usb_register(&mxl111sf_driver);
-       if (result) {
-               err("usb_register failed. Error number %d", result);
-               return result;
-       }
-
-       return 0;
-}
-
-static void __exit mxl111sf_module_exit(void)
-{
-       usb_deregister(&mxl111sf_driver);
-}
-
-module_init(mxl111sf_module_init);
-module_exit(mxl111sf_module_exit);
+module_usb_driver(mxl111sf_driver);
 
 MODULE_AUTHOR("Michael Krufky <mkrufky@kernellabs.com>");
 MODULE_DESCRIPTION("Driver for MaxLinear MxL111SF");