Merge branch 'for-3.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren...

[~andy/linux] / drivers / usb / misc / adutux.c

diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index fe858711651cc16acf1b662a6ceb0de538e60e56..284b85461410a82129ed43d7082953d8cb81849e 100644 (file)
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -885,40 +885,7 @@ static struct usb_driver adu_driver = {
        .id_table = device_table,
 };
 
-static int __init adu_init(void)
-{
-       int result;
-
-       dbg(2," %s : enter", __func__);
-
-       /* register this driver with the USB subsystem */
-       result = usb_register(&adu_driver);
-       if (result < 0) {
-               printk(KERN_ERR "usb_register failed for the "__FILE__
-                      " driver. Error number %d\n", result);
-               goto exit;
-       }
-
-       printk(KERN_INFO "adutux " DRIVER_DESC " " DRIVER_VERSION "\n");
-       printk(KERN_INFO "adutux is an experimental driver. "
-              "Use at your own risk\n");
-
-exit:
-       dbg(2," %s : leave, return value %d", __func__, result);
-
-       return result;
-}
-
-static void __exit adu_exit(void)
-{
-       dbg(2," %s : enter", __func__);
-       /* deregister this driver with the USB subsystem */
-       usb_deregister(&adu_driver);
-       dbg(2," %s : leave", __func__);
-}
-
-module_init(adu_init);
-module_exit(adu_exit);
+module_usb_driver(adu_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);