Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[linux-drm-fsl-dcu.git] / sound / usb / caiaq / device.c

diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
index 7cf67e44d85b0ac714feba024ec61f8bcb6c72b1..64aed432ae2213dfaca6dba0818ccca8cc38352c 100644 (file)
--- a/sound/usb/caiaq/device.c
+++ b/sound/usb/caiaq/device.c
@@ -538,16 +538,5 @@ static struct usb_driver snd_usb_driver = {
        .id_table       = snd_usb_id_table,
 };
 
-static int __init snd_module_init(void)
-{
-       return usb_register(&snd_usb_driver);
-}
-
-static void __exit snd_module_exit(void)
-{
-       usb_deregister(&snd_usb_driver);
-}
-
-module_init(snd_module_init)
-module_exit(snd_module_exit)
+module_usb_driver(snd_usb_driver);