summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/nokia.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2014-07-09 18:09:56 +0200
committerFelipe Balbi <balbi@ti.com>2014-07-10 15:37:09 +0200
commit909346a819c5b81420d861bd53abd1140b26104e (patch)
tree229682de918115a852058ce4228862de50cb68a7 /drivers/usb/gadget/nokia.c
parentusb: gadget: Add helper macro for usb_composite_driver boilerplate (diff)
downloadlinux-909346a819c5b81420d861bd53abd1140b26104e.tar.xz
linux-909346a819c5b81420d861bd53abd1140b26104e.zip
usb: gadget: Convert drivers to use module_usb_composite_driver()
Use the module_usb_composite_driver() macro where applicable to eliminate the module_init/module_exit boilerplate in USB gadget composite drivers. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/nokia.c')
-rw-r--r--drivers/usb/gadget/nokia.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/usb/gadget/nokia.c b/drivers/usb/gadget/nokia.c
index 3ab386167519..9b8fd701648c 100644
--- a/drivers/usb/gadget/nokia.c
+++ b/drivers/usb/gadget/nokia.c
@@ -347,14 +347,4 @@ static __refdata struct usb_composite_driver nokia_driver = {
.unbind = __exit_p(nokia_unbind),
};
-static int __init nokia_init(void)
-{
- return usb_composite_probe(&nokia_driver);
-}
-module_init(nokia_init);
-
-static void __exit nokia_cleanup(void)
-{
- usb_composite_unregister(&nokia_driver);
-}
-module_exit(nokia_cleanup);
+module_usb_composite_driver(nokia_driver);