From: Wei Yongjun <weiyongjun1@huawei.com>
Date: Tue, 28 Apr 2020 13:39:34 +0000 (+0000)
Subject: usb: gadget: mass_storage: use module_usb_composite_driver to simplify the code
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=46b11a91124d481ff4754ec624fc5393a515a361;p=linux.git

usb: gadget: mass_storage: use module_usb_composite_driver to simplify the code

module_usb_composite_driver() makes the code simpler by
eliminating boilerplate code.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---

diff --git a/drivers/usb/gadget/legacy/mass_storage.c b/drivers/usb/gadget/legacy/mass_storage.c
index f18f77584fc21..9ed22c5fb7fe2 100644
--- a/drivers/usb/gadget/legacy/mass_storage.c
+++ b/drivers/usb/gadget/legacy/mass_storage.c
@@ -229,18 +229,8 @@ static struct usb_composite_driver msg_driver = {
 	.unbind		= msg_unbind,
 };
 
+module_usb_composite_driver(msg_driver);
+
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR("Michal Nazarewicz");
 MODULE_LICENSE("GPL");
-
-static int __init msg_init(void)
-{
-	return usb_composite_probe(&msg_driver);
-}
-module_init(msg_init);
-
-static void __exit msg_cleanup(void)
-{
-	usb_composite_unregister(&msg_driver);
-}
-module_exit(msg_cleanup);