diff options
author | Tobias Klauser <tklauser@distanz.ch> | 2014-07-09 12:09:56 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-07-10 09:37:09 -0400 |
commit | 909346a819c5b81420d861bd53abd1140b26104e (patch) | |
tree | 229682de918115a852058ce4228862de50cb68a7 | |
parent | 7ec3ea181d8cffb669982d79664f119ef6a71fc3 (diff) |
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>
-rw-r--r-- | drivers/usb/gadget/acm_ms.c | 14 | ||||
-rw-r--r-- | drivers/usb/gadget/audio.c | 12 | ||||
-rw-r--r-- | drivers/usb/gadget/cdc2.c | 14 | ||||
-rw-r--r-- | drivers/usb/gadget/ether.c | 14 | ||||
-rw-r--r-- | drivers/usb/gadget/gmidi.c | 13 | ||||
-rw-r--r-- | drivers/usb/gadget/multi.c | 13 | ||||
-rw-r--r-- | drivers/usb/gadget/ncm.c | 14 | ||||
-rw-r--r-- | drivers/usb/gadget/nokia.c | 12 | ||||
-rw-r--r-- | drivers/usb/gadget/webcam.c | 15 | ||||
-rw-r--r-- | drivers/usb/gadget/zero.c | 14 |
10 files changed, 15 insertions, 120 deletions
diff --git a/drivers/usb/gadget/acm_ms.c b/drivers/usb/gadget/acm_ms.c index a252444cc0a7..c30b7b572465 100644 --- a/drivers/usb/gadget/acm_ms.c +++ b/drivers/usb/gadget/acm_ms.c | |||
@@ -267,18 +267,8 @@ static __refdata struct usb_composite_driver acm_ms_driver = { | |||
267 | .unbind = __exit_p(acm_ms_unbind), | 267 | .unbind = __exit_p(acm_ms_unbind), |
268 | }; | 268 | }; |
269 | 269 | ||
270 | module_usb_composite_driver(acm_ms_driver); | ||
271 | |||
270 | MODULE_DESCRIPTION(DRIVER_DESC); | 272 | MODULE_DESCRIPTION(DRIVER_DESC); |
271 | MODULE_AUTHOR("Klaus Schwarzkopf <schwarzkopf@sensortherm.de>"); | 273 | MODULE_AUTHOR("Klaus Schwarzkopf <schwarzkopf@sensortherm.de>"); |
272 | MODULE_LICENSE("GPL v2"); | 274 | MODULE_LICENSE("GPL v2"); |
273 | |||
274 | static int __init init(void) | ||
275 | { | ||
276 | return usb_composite_probe(&acm_ms_driver); | ||
277 | } | ||
278 | module_init(init); | ||
279 | |||
280 | static void __exit cleanup(void) | ||
281 | { | ||
282 | usb_composite_unregister(&acm_ms_driver); | ||
283 | } | ||
284 | module_exit(cleanup); | ||
diff --git a/drivers/usb/gadget/audio.c b/drivers/usb/gadget/audio.c index 231b0efe8fdc..6eb695e5e43a 100644 --- a/drivers/usb/gadget/audio.c +++ b/drivers/usb/gadget/audio.c | |||
@@ -172,17 +172,7 @@ static __refdata struct usb_composite_driver audio_driver = { | |||
172 | .unbind = __exit_p(audio_unbind), | 172 | .unbind = __exit_p(audio_unbind), |
173 | }; | 173 | }; |
174 | 174 | ||
175 | static int __init init(void) | 175 | module_usb_composite_driver(audio_driver); |
176 | { | ||
177 | return usb_composite_probe(&audio_driver); | ||
178 | } | ||
179 | module_init(init); | ||
180 | |||
181 | static void __exit cleanup(void) | ||
182 | { | ||
183 | usb_composite_unregister(&audio_driver); | ||
184 | } | ||
185 | module_exit(cleanup); | ||
186 | 176 | ||
187 | MODULE_DESCRIPTION(DRIVER_DESC); | 177 | MODULE_DESCRIPTION(DRIVER_DESC); |
188 | MODULE_AUTHOR("Bryan Wu <cooloney@kernel.org>"); | 178 | MODULE_AUTHOR("Bryan Wu <cooloney@kernel.org>"); |
diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c index e126b6b248e6..2e85d9473478 100644 --- a/drivers/usb/gadget/cdc2.c +++ b/drivers/usb/gadget/cdc2.c | |||
@@ -231,18 +231,8 @@ static __refdata struct usb_composite_driver cdc_driver = { | |||
231 | .unbind = __exit_p(cdc_unbind), | 231 | .unbind = __exit_p(cdc_unbind), |
232 | }; | 232 | }; |
233 | 233 | ||
234 | module_usb_composite_driver(cdc_driver); | ||
235 | |||
234 | MODULE_DESCRIPTION(DRIVER_DESC); | 236 | MODULE_DESCRIPTION(DRIVER_DESC); |
235 | MODULE_AUTHOR("David Brownell"); | 237 | MODULE_AUTHOR("David Brownell"); |
236 | MODULE_LICENSE("GPL"); | 238 | MODULE_LICENSE("GPL"); |
237 | |||
238 | static int __init init(void) | ||
239 | { | ||
240 | return usb_composite_probe(&cdc_driver); | ||
241 | } | ||
242 | module_init(init); | ||
243 | |||
244 | static void __exit cleanup(void) | ||
245 | { | ||
246 | usb_composite_unregister(&cdc_driver); | ||
247 | } | ||
248 | module_exit(cleanup); | ||
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index c1c113ef950c..c5fdc61cdc4a 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c | |||
@@ -475,18 +475,8 @@ static __refdata struct usb_composite_driver eth_driver = { | |||
475 | .unbind = __exit_p(eth_unbind), | 475 | .unbind = __exit_p(eth_unbind), |
476 | }; | 476 | }; |
477 | 477 | ||
478 | module_usb_composite_driver(eth_driver); | ||
479 | |||
478 | MODULE_DESCRIPTION(PREFIX DRIVER_DESC); | 480 | MODULE_DESCRIPTION(PREFIX DRIVER_DESC); |
479 | MODULE_AUTHOR("David Brownell, Benedikt Spanger"); | 481 | MODULE_AUTHOR("David Brownell, Benedikt Spanger"); |
480 | MODULE_LICENSE("GPL"); | 482 | MODULE_LICENSE("GPL"); |
481 | |||
482 | static int __init init(void) | ||
483 | { | ||
484 | return usb_composite_probe(ð_driver); | ||
485 | } | ||
486 | module_init(init); | ||
487 | |||
488 | static void __exit cleanup(void) | ||
489 | { | ||
490 | usb_composite_unregister(ð_driver); | ||
491 | } | ||
492 | module_exit(cleanup); | ||
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c index e879e2c9f461..3d696b86ff76 100644 --- a/drivers/usb/gadget/gmidi.c +++ b/drivers/usb/gadget/gmidi.c | |||
@@ -163,15 +163,4 @@ static __refdata struct usb_composite_driver midi_driver = { | |||
163 | .unbind = __exit_p(midi_unbind), | 163 | .unbind = __exit_p(midi_unbind), |
164 | }; | 164 | }; |
165 | 165 | ||
166 | static int __init midi_init(void) | 166 | module_usb_composite_driver(midi_driver); |
167 | { | ||
168 | return usb_composite_probe(&midi_driver); | ||
169 | } | ||
170 | module_init(midi_init); | ||
171 | |||
172 | static void __exit midi_cleanup(void) | ||
173 | { | ||
174 | usb_composite_unregister(&midi_driver); | ||
175 | } | ||
176 | module_exit(midi_cleanup); | ||
177 | |||
diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c index 940f6cde8e89..39d27bb343b4 100644 --- a/drivers/usb/gadget/multi.c +++ b/drivers/usb/gadget/multi.c | |||
@@ -507,15 +507,4 @@ static __refdata struct usb_composite_driver multi_driver = { | |||
507 | .needs_serial = 1, | 507 | .needs_serial = 1, |
508 | }; | 508 | }; |
509 | 509 | ||
510 | 510 | module_usb_composite_driver(multi_driver); | |
511 | static int __init multi_init(void) | ||
512 | { | ||
513 | return usb_composite_probe(&multi_driver); | ||
514 | } | ||
515 | module_init(multi_init); | ||
516 | |||
517 | static void __exit multi_exit(void) | ||
518 | { | ||
519 | usb_composite_unregister(&multi_driver); | ||
520 | } | ||
521 | module_exit(multi_exit); | ||
diff --git a/drivers/usb/gadget/ncm.c b/drivers/usb/gadget/ncm.c index 81956feca1bd..e90e23db2acb 100644 --- a/drivers/usb/gadget/ncm.c +++ b/drivers/usb/gadget/ncm.c | |||
@@ -204,18 +204,8 @@ static __refdata struct usb_composite_driver ncm_driver = { | |||
204 | .unbind = __exit_p(gncm_unbind), | 204 | .unbind = __exit_p(gncm_unbind), |
205 | }; | 205 | }; |
206 | 206 | ||
207 | module_usb_composite_driver(ncm_driver); | ||
208 | |||
207 | MODULE_DESCRIPTION(DRIVER_DESC); | 209 | MODULE_DESCRIPTION(DRIVER_DESC); |
208 | MODULE_AUTHOR("Yauheni Kaliuta"); | 210 | MODULE_AUTHOR("Yauheni Kaliuta"); |
209 | MODULE_LICENSE("GPL"); | 211 | MODULE_LICENSE("GPL"); |
210 | |||
211 | static int __init init(void) | ||
212 | { | ||
213 | return usb_composite_probe(&ncm_driver); | ||
214 | } | ||
215 | module_init(init); | ||
216 | |||
217 | static void __exit cleanup(void) | ||
218 | { | ||
219 | usb_composite_unregister(&ncm_driver); | ||
220 | } | ||
221 | module_exit(cleanup); | ||
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 = { | |||
347 | .unbind = __exit_p(nokia_unbind), | 347 | .unbind = __exit_p(nokia_unbind), |
348 | }; | 348 | }; |
349 | 349 | ||
350 | static int __init nokia_init(void) | 350 | module_usb_composite_driver(nokia_driver); |
351 | { | ||
352 | return usb_composite_probe(&nokia_driver); | ||
353 | } | ||
354 | module_init(nokia_init); | ||
355 | |||
356 | static void __exit nokia_cleanup(void) | ||
357 | { | ||
358 | usb_composite_unregister(&nokia_driver); | ||
359 | } | ||
360 | module_exit(nokia_cleanup); | ||
diff --git a/drivers/usb/gadget/webcam.c b/drivers/usb/gadget/webcam.c index 8cef1e658c29..a11d8e420bfe 100644 --- a/drivers/usb/gadget/webcam.c +++ b/drivers/usb/gadget/webcam.c | |||
@@ -390,20 +390,7 @@ static __refdata struct usb_composite_driver webcam_driver = { | |||
390 | .unbind = webcam_unbind, | 390 | .unbind = webcam_unbind, |
391 | }; | 391 | }; |
392 | 392 | ||
393 | static int __init | 393 | module_usb_composite_driver(webcam_driver); |
394 | webcam_init(void) | ||
395 | { | ||
396 | return usb_composite_probe(&webcam_driver); | ||
397 | } | ||
398 | |||
399 | static void __exit | ||
400 | webcam_cleanup(void) | ||
401 | { | ||
402 | usb_composite_unregister(&webcam_driver); | ||
403 | } | ||
404 | |||
405 | module_init(webcam_init); | ||
406 | module_exit(webcam_cleanup); | ||
407 | 394 | ||
408 | MODULE_AUTHOR("Laurent Pinchart"); | 395 | MODULE_AUTHOR("Laurent Pinchart"); |
409 | MODULE_DESCRIPTION("Webcam Video Gadget"); | 396 | MODULE_DESCRIPTION("Webcam Video Gadget"); |
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c index 134f354ede62..c3d496828b74 100644 --- a/drivers/usb/gadget/zero.c +++ b/drivers/usb/gadget/zero.c | |||
@@ -411,17 +411,7 @@ static __refdata struct usb_composite_driver zero_driver = { | |||
411 | .resume = zero_resume, | 411 | .resume = zero_resume, |
412 | }; | 412 | }; |
413 | 413 | ||
414 | module_usb_composite_driver(zero_driver); | ||
415 | |||
414 | MODULE_AUTHOR("David Brownell"); | 416 | MODULE_AUTHOR("David Brownell"); |
415 | MODULE_LICENSE("GPL"); | 417 | MODULE_LICENSE("GPL"); |
416 | |||
417 | static int __init init(void) | ||
418 | { | ||
419 | return usb_composite_probe(&zero_driver); | ||
420 | } | ||
421 | module_init(init); | ||
422 | |||
423 | static void __exit cleanup(void) | ||
424 | { | ||
425 | usb_composite_unregister(&zero_driver); | ||
426 | } | ||
427 | module_exit(cleanup); | ||