Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus

[~andy/linux] / drivers / usb / storage / uas.c

diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 1d10d5b8204c641289a0150649ea7bf694c53ae2..a33ead5dce2045d2abc18779c05c26b20a339bc0 100644 (file)
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -760,18 +760,7 @@ static struct usb_driver uas_driver = {
        .id_table = uas_usb_ids,
 };
 
-static int uas_init(void)
-{
-       return usb_register(&uas_driver);
-}
-
-static void uas_exit(void)
-{
-       usb_deregister(&uas_driver);
-}
-
-module_init(uas_init);
-module_exit(uas_exit);
+module_usb_driver(uas_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Matthew Wilcox and Sarah Sharp");