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

[~andy/linux] / drivers / media / dvb / ttusb-budget / dvb-ttusb-budget.c

diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 8aa01149351a166e6c2bd8d2848d61068e7194db..5b682cc4c814e99501c45f82ea17171029301183 100644 (file)
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1808,26 +1808,7 @@ static struct usb_driver ttusb_driver = {
       .id_table                = ttusb_table,
 };
 
-static int __init ttusb_init(void)
-{
-       int err;
-
-       if ((err = usb_register(&ttusb_driver)) < 0) {
-               printk("%s: usb_register failed! Error number %d",
-                      __FILE__, err);
-               return err;
-       }
-
-       return 0;
-}
-
-static void __exit ttusb_exit(void)
-{
-       usb_deregister(&ttusb_driver);
-}
-
-module_init(ttusb_init);
-module_exit(ttusb_exit);
+module_usb_driver(ttusb_driver);
 
 MODULE_AUTHOR("Holger Waechtler <holger@convergence.de>");
 MODULE_DESCRIPTION("TTUSB DVB Driver");