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 / af9015.c

diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index e755d7637c2210da530543a31a44e35913fa4cdf..282a43d648df1817ec0d86ef4adf995706af52cf 100644 (file)
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1967,25 +1967,7 @@ static struct usb_driver af9015_usb_driver = {
        .id_table = af9015_usb_table,
 };
 
-/* module stuff */
-static int __init af9015_usb_module_init(void)
-{
-       int ret;
-       ret = usb_register(&af9015_usb_driver);
-       if (ret)
-               err("module init failed:%d", ret);
-
-       return ret;
-}
-
-static void __exit af9015_usb_module_exit(void)
-{
-       /* deregister this driver from the USB subsystem */
-       usb_deregister(&af9015_usb_driver);
-}
-
-module_init(af9015_usb_module_init);
-module_exit(af9015_usb_module_exit);
+module_usb_driver(af9015_usb_driver);
 
 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
 MODULE_DESCRIPTION("Driver for Afatech AF9015 DVB-T");