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

[~andy/linux] / drivers / media / video / tm6000 / tm6000-cards.c

diff --git a/drivers/media/video/tm6000/tm6000-cards.c b/drivers/media/video/tm6000/tm6000-cards.c
index 3678918821b08690c3e1dd8bc3304b7010f386a1..034659b1317480a3c389ff9619dd3123c9aeb39d 100644 (file)
--- a/drivers/media/video/tm6000/tm6000-cards.c
+++ b/drivers/media/video/tm6000/tm6000-cards.c
@@ -1406,31 +1406,7 @@ static struct usb_driver tm6000_usb_driver = {
                .id_table = tm6000_id_table,
 };
 
-static int __init tm6000_module_init(void)
-{
-       int result;
-
-       printk(KERN_INFO "tm6000" " v4l2 driver version %d.%d.%d loaded\n",
-              (TM6000_VERSION  >> 16) & 0xff,
-              (TM6000_VERSION  >> 8) & 0xff, TM6000_VERSION  & 0xff);
-
-       /* register this driver with the USB subsystem */
-       result = usb_register(&tm6000_usb_driver);
-       if (result)
-               printk(KERN_ERR "tm6000"
-                          " usb_register failed. Error number %d.\n", result);
-
-       return result;
-}
-
-static void __exit tm6000_module_exit(void)
-{
-       /* deregister at USB subsystem */
-       usb_deregister(&tm6000_usb_driver);
-}
-
-module_init(tm6000_module_init);
-module_exit(tm6000_module_exit);
+module_usb_driver(tm6000_usb_driver);
 
 MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000/TM6010 USB2 adapter");
 MODULE_AUTHOR("Mauro Carvalho Chehab");