OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Tobias Klauser 2014-07-09 18:09:56 +02:00 committed by Felipe Balbi
parent 7ec3ea181d
commit 909346a819
10 changed files with 15 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/usb/gadget/acm_ms.c
View File

@ -267,18 +267,8 @@ static __refdata struct usb_composite_driver acm_ms_driver = {
.unbind = __exit_p(acm_ms_unbind), .unbind = __exit_p(acm_ms_unbind),
}; };
module_usb_composite_driver(acm_ms_driver);
MODULE_DESCRIPTION(DRIVER_DESC); MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_AUTHOR("Klaus Schwarzkopf <schwarzkopf@sensortherm.de>"); MODULE_AUTHOR("Klaus Schwarzkopf <schwarzkopf@sensortherm.de>");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
static int __init init(void)
{
return usb_composite_probe(&acm_ms_driver);
}
module_init(init);
static void __exit cleanup(void)
{
usb_composite_unregister(&acm_ms_driver);
}
module_exit(cleanup);

12
drivers/usb/gadget/audio.c
View File

@ -172,17 +172,7 @@ static __refdata struct usb_composite_driver audio_driver = {
.unbind = __exit_p(audio_unbind), .unbind = __exit_p(audio_unbind),
}; };
static int __init init(void) module_usb_composite_driver(audio_driver);
{
return usb_composite_probe(&audio_driver);
}
module_init(init);
static void __exit cleanup(void)
{
usb_composite_unregister(&audio_driver);
}
module_exit(cleanup);
MODULE_DESCRIPTION(DRIVER_DESC); MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_AUTHOR("Bryan Wu <cooloney@kernel.org>"); MODULE_AUTHOR("Bryan Wu <cooloney@kernel.org>");

14
drivers/usb/gadget/cdc2.c
View File

@ -231,18 +231,8 @@ static __refdata struct usb_composite_driver cdc_driver = {
.unbind = __exit_p(cdc_unbind), .unbind = __exit_p(cdc_unbind),
}; };
module_usb_composite_driver(cdc_driver);
MODULE_DESCRIPTION(DRIVER_DESC); MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_AUTHOR("David Brownell"); MODULE_AUTHOR("David Brownell");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int __init init(void)
{
return usb_composite_probe(&cdc_driver);
}
module_init(init);
static void __exit cleanup(void)
{
usb_composite_unregister(&cdc_driver);
}
module_exit(cleanup);

14
drivers/usb/gadget/ether.c
View File

@ -475,18 +475,8 @@ static __refdata struct usb_composite_driver eth_driver = {
.unbind = __exit_p(eth_unbind), .unbind = __exit_p(eth_unbind),
}; };
module_usb_composite_driver(eth_driver);
MODULE_DESCRIPTION(PREFIX DRIVER_DESC); MODULE_DESCRIPTION(PREFIX DRIVER_DESC);
MODULE_AUTHOR("David Brownell, Benedikt Spanger"); MODULE_AUTHOR("David Brownell, Benedikt Spanger");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int __init init(void)
{
return usb_composite_probe(&eth_driver);
}
module_init(init);
static void __exit cleanup(void)
{
usb_composite_unregister(&eth_driver);
}
module_exit(cleanup);

13
drivers/usb/gadget/gmidi.c
View File

@ -163,15 +163,4 @@ static __refdata struct usb_composite_driver midi_driver = {
.unbind = __exit_p(midi_unbind), .unbind = __exit_p(midi_unbind),
}; };
static int __init midi_init(void) module_usb_composite_driver(midi_driver);
{
return usb_composite_probe(&midi_driver);
}
module_init(midi_init);
static void __exit midi_cleanup(void)
{
usb_composite_unregister(&midi_driver);
}
module_exit(midi_cleanup);

13
drivers/usb/gadget/multi.c
View File

@ -507,15 +507,4 @@ static __refdata struct usb_composite_driver multi_driver = {
.needs_serial = 1, .needs_serial = 1,
}; };
module_usb_composite_driver(multi_driver);
static int __init multi_init(void)
{
return usb_composite_probe(&multi_driver);
}
module_init(multi_init);
static void __exit multi_exit(void)
{
usb_composite_unregister(&multi_driver);
}
module_exit(multi_exit);

14
drivers/usb/gadget/ncm.c
View File

@ -204,18 +204,8 @@ static __refdata struct usb_composite_driver ncm_driver = {
.unbind = __exit_p(gncm_unbind), .unbind = __exit_p(gncm_unbind),
}; };
module_usb_composite_driver(ncm_driver);
MODULE_DESCRIPTION(DRIVER_DESC); MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_AUTHOR("Yauheni Kaliuta"); MODULE_AUTHOR("Yauheni Kaliuta");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int __init init(void)
{
return usb_composite_probe(&ncm_driver);
}
module_init(init);
static void __exit cleanup(void)
{
usb_composite_unregister(&ncm_driver);
}
module_exit(cleanup);

12
drivers/usb/gadget/nokia.c
View File

@ -347,14 +347,4 @@ static __refdata struct usb_composite_driver nokia_driver = {
.unbind = __exit_p(nokia_unbind), .unbind = __exit_p(nokia_unbind),
}; };
static int __init nokia_init(void) module_usb_composite_driver(nokia_driver);
{
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);

15
drivers/usb/gadget/webcam.c
View File

@ -390,20 +390,7 @@ static __refdata struct usb_composite_driver webcam_driver = {
.unbind = webcam_unbind, .unbind = webcam_unbind,
}; };
static int __init module_usb_composite_driver(webcam_driver);
webcam_init(void)
{
return usb_composite_probe(&webcam_driver);
}
static void __exit
webcam_cleanup(void)
{
usb_composite_unregister(&webcam_driver);
}
module_init(webcam_init);
module_exit(webcam_cleanup);
MODULE_AUTHOR("Laurent Pinchart"); MODULE_AUTHOR("Laurent Pinchart");
MODULE_DESCRIPTION("Webcam Video Gadget"); MODULE_DESCRIPTION("Webcam Video Gadget");

14
drivers/usb/gadget/zero.c
View File

@ -411,17 +411,7 @@ static __refdata struct usb_composite_driver zero_driver = {
.resume = zero_resume, .resume = zero_resume,
}; };
module_usb_composite_driver(zero_driver);
MODULE_AUTHOR("David Brownell"); MODULE_AUTHOR("David Brownell");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int __init init(void)
{
return usb_composite_probe(&zero_driver);
}
module_init(init);
static void __exit cleanup(void)
{
usb_composite_unregister(&zero_driver);
}
module_exit(cleanup);