Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 909346a8 authored by Tobias Klauser's avatar Tobias Klauser Committed by Felipe Balbi
Browse files

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: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 7ec3ea18

drivers/usb/gadget/acm_ms.c

+2 −12
Original line number Diff line number Diff line
@@ -267,18 +267,8 @@ static __refdata struct usb_composite_driver acm_ms_driver = { 
	.unbind		= __exit_p(acm_ms_unbind),

};



module_usb_composite_driver(acm_ms_driver);



MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_AUTHOR("Klaus Schwarzkopf <schwarzkopf@sensortherm.de>");

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);

drivers/usb/gadget/audio.c

+1 −11
Original line number Diff line number Diff line
@@ -172,17 +172,7 @@ static __refdata struct usb_composite_driver audio_driver = { 
	.unbind		= __exit_p(audio_unbind),

};



static int __init init(void)

{

	return usb_composite_probe(&audio_driver);

}

module_init(init);



static void __exit cleanup(void)

{

	usb_composite_unregister(&audio_driver);

}

module_exit(cleanup);

module_usb_composite_driver(audio_driver);



MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_AUTHOR("Bryan Wu <cooloney@kernel.org>");

drivers/usb/gadget/cdc2.c

+2 −12
Original line number Diff line number Diff line
@@ -231,18 +231,8 @@ static __refdata struct usb_composite_driver cdc_driver = { 
	.unbind		= __exit_p(cdc_unbind),

};



module_usb_composite_driver(cdc_driver);



MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_AUTHOR("David Brownell");

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);

drivers/usb/gadget/ether.c

+2 −12
Original line number Diff line number Diff line
@@ -475,18 +475,8 @@ static __refdata struct usb_composite_driver eth_driver = { 
	.unbind		= __exit_p(eth_unbind),

};



module_usb_composite_driver(eth_driver);



MODULE_DESCRIPTION(PREFIX DRIVER_DESC);

MODULE_AUTHOR("David Brownell, Benedikt Spanger");

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);

drivers/usb/gadget/gmidi.c

+1 −12
Original line number Diff line number Diff line
@@ -163,15 +163,4 @@ static __refdata struct usb_composite_driver midi_driver = { 
	.unbind		= __exit_p(midi_unbind),

};



static int __init midi_init(void)

{

	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);

module_usb_composite_driver(midi_driver);