Merge branch 'stable/for-linus-3.3' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / usb / wusbcore / cbaf.c

diff --git a/drivers/usb/wusbcore/cbaf.c b/drivers/usb/wusbcore/cbaf.c
index 200fd7c6c7d5e5de6a0ee6e34c0d2879c2809141..7f78f300f8fbe02674aa7f1f0846d8399c3be0f8 100644 (file)
--- a/drivers/usb/wusbcore/cbaf.c
+++ b/drivers/usb/wusbcore/cbaf.c
@@ -655,17 +655,7 @@ static struct usb_driver cbaf_driver = {
        .disconnect =   cbaf_disconnect,
 };
 
-static int __init cbaf_driver_init(void)
-{
-       return usb_register(&cbaf_driver);
-}
-module_init(cbaf_driver_init);
-
-static void __exit cbaf_driver_exit(void)
-{
-       usb_deregister(&cbaf_driver);
-}
-module_exit(cbaf_driver_exit);
+module_usb_driver(cbaf_driver);
 
 MODULE_AUTHOR("Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>");
 MODULE_DESCRIPTION("Wireless USB Cable Based Association");