Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: convert sound/* to use module_usb_driver()

This converts the drivers in sound/* to use the
module_usb_driver() macro which makes the code smaller and a bit
simpler.

Added bonus is that it removes some unneeded kernel log messages about
drivers loading and/or unloading.

Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Daniel Mack <zonque@gmail.com>
Cc: Clemens Ladisch <clemens@ladisch.de>
Cc: Torsten Schenk <torsten.schenk@zoho.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Karsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+6 -63
+2 -13
sound/usb/6fire/chip.c
··· 211 211 212 212 MODULE_DEVICE_TABLE(usb, device_table); 213 213 214 - static struct usb_driver driver = { 214 + static struct usb_driver usb_driver = { 215 215 .name = "snd-usb-6fire", 216 216 .probe = usb6fire_chip_probe, 217 217 .disconnect = usb6fire_chip_disconnect, 218 218 .id_table = device_table, 219 219 }; 220 220 221 - static int __init usb6fire_chip_init(void) 222 - { 223 - return usb_register(&driver); 224 - } 225 - 226 - static void __exit usb6fire_chip_cleanup(void) 227 - { 228 - usb_deregister(&driver); 229 - } 230 - 231 - module_init(usb6fire_chip_init); 232 - module_exit(usb6fire_chip_cleanup); 221 + module_usb_driver(usb_driver);
+1 -12
sound/usb/caiaq/device.c
··· 538 538 .id_table = snd_usb_id_table, 539 539 }; 540 540 541 - static int __init snd_module_init(void) 542 - { 543 - return usb_register(&snd_usb_driver); 544 - } 545 - 546 - static void __exit snd_module_exit(void) 547 - { 548 - usb_deregister(&snd_usb_driver); 549 - } 550 - 551 - module_init(snd_module_init) 552 - module_exit(snd_module_exit) 541 + module_usb_driver(snd_usb_driver); 553 542
+1 -13
sound/usb/misc/ua101.c
··· 1387 1387 #endif 1388 1388 }; 1389 1389 1390 - static int __init alsa_card_ua101_init(void) 1391 - { 1392 - return usb_register(&ua101_driver); 1393 - } 1394 - 1395 - static void __exit alsa_card_ua101_exit(void) 1396 - { 1397 - usb_deregister(&ua101_driver); 1398 - mutex_destroy(&devices_mutex); 1399 - } 1400 - 1401 - module_init(alsa_card_ua101_init); 1402 - module_exit(alsa_card_ua101_exit); 1390 + module_usb_driver(ua101_driver);
+1 -13
sound/usb/usx2y/us122l.c
··· 772 772 .supports_autosuspend = 1 773 773 }; 774 774 775 - 776 - static int __init snd_us122l_module_init(void) 777 - { 778 - return usb_register(&snd_us122l_usb_driver); 779 - } 780 - 781 - static void __exit snd_us122l_module_exit(void) 782 - { 783 - usb_deregister(&snd_us122l_usb_driver); 784 - } 785 - 786 - module_init(snd_us122l_module_init) 787 - module_exit(snd_us122l_module_exit) 775 + module_usb_driver(snd_us122l_usb_driver);
+1 -12
sound/usb/usx2y/usbusx2y.c
··· 459 459 } 460 460 } 461 461 462 - static int __init snd_usX2Y_module_init(void) 463 - { 464 - return usb_register(&snd_usX2Y_usb_driver); 465 - } 466 - 467 - static void __exit snd_usX2Y_module_exit(void) 468 - { 469 - usb_deregister(&snd_usX2Y_usb_driver); 470 - } 471 - 472 - module_init(snd_usX2Y_module_init) 473 - module_exit(snd_usX2Y_module_exit) 462 + module_usb_driver(snd_usX2Y_usb_driver);