Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia

[~andy/linux] / drivers / usb / class / usbtmc.c

diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 12cf5e7395a82c5fcadee6e9b775a1fe5f6f079f..70d69d06054f2faeaa1d4c9b2954d5cc0ca6e5b4 100644 (file)
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -1116,21 +1116,6 @@ static struct usb_driver usbtmc_driver = {
        .resume         = usbtmc_resume,
 };
 
-static int __init usbtmc_init(void)
-{
-       int retcode;
-
-       retcode = usb_register(&usbtmc_driver);
-       if (retcode)
-               printk(KERN_ERR KBUILD_MODNAME": Unable to register driver\n");
-       return retcode;
-}
-module_init(usbtmc_init);
-
-static void __exit usbtmc_exit(void)
-{
-       usb_deregister(&usbtmc_driver);
-}
-module_exit(usbtmc_exit);
+module_usb_driver(usbtmc_driver);
 
 MODULE_LICENSE("GPL");