diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-18 12:50:44 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-18 12:50:44 -0500 |
commit | 424f0750edd5af866f80f5e65998e0610503cb5c (patch) | |
tree | 32075ed9fe97675ba81c6f2f0e86741f2a1d94a3 /sound/usb/6fire | |
parent | 42f06a13445bffae96c5e42fdd721ef65fed6abf (diff) |
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>
Diffstat (limited to 'sound/usb/6fire')
-rw-r--r-- | sound/usb/6fire/chip.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sound/usb/6fire/chip.c b/sound/usb/6fire/chip.c index c7dca7b0b9fe..ac2d5e10f1a8 100644 --- a/sound/usb/6fire/chip.c +++ b/sound/usb/6fire/chip.c | |||
@@ -211,22 +211,11 @@ static struct usb_device_id device_table[] = { | |||
211 | 211 | ||
212 | MODULE_DEVICE_TABLE(usb, device_table); | 212 | MODULE_DEVICE_TABLE(usb, device_table); |
213 | 213 | ||
214 | static struct usb_driver driver = { | 214 | static struct usb_driver usb_driver = { |
215 | .name = "snd-usb-6fire", | 215 | .name = "snd-usb-6fire", |
216 | .probe = usb6fire_chip_probe, | 216 | .probe = usb6fire_chip_probe, |
217 | .disconnect = usb6fire_chip_disconnect, | 217 | .disconnect = usb6fire_chip_disconnect, |
218 | .id_table = device_table, | 218 | .id_table = device_table, |
219 | }; | 219 | }; |
220 | 220 | ||
221 | static int __init usb6fire_chip_init(void) | 221 | module_usb_driver(usb_driver); |
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); | ||