diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-21 12:51:35 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-21 12:51:35 +0200 |
| commit | 382e6a859e6622de0aa62c01976ae8ebd90e986d (patch) | |
| tree | 2501c554c231c5d0fcda7ff2e6e055bf23134d6f /sound/pci/mixart/mixart.c | |
| parent | 6de15b2a9330aeb5df9b66545f67c6c6ad2c045a (diff) | |
| parent | 97f8d3b6503082416898f893a442a78f8819c42a (diff) | |
| download | blackbird-op-linux-382e6a859e6622de0aa62c01976ae8ebd90e986d.tar.gz blackbird-op-linux-382e6a859e6622de0aa62c01976ae8ebd90e986d.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/mixart/mixart.c')
| -rw-r--r-- | sound/pci/mixart/mixart.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index 487837c01c9f..0762610c99c0 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c @@ -1380,22 +1380,11 @@ static void __devexit snd_mixart_remove(struct pci_dev *pci) pci_set_drvdata(pci, NULL); } -static struct pci_driver driver = { +static struct pci_driver mixart_driver = { .name = KBUILD_MODNAME, .id_table = snd_mixart_ids, .probe = snd_mixart_probe, .remove = __devexit_p(snd_mixart_remove), }; -static int __init alsa_card_mixart_init(void) -{ - return pci_register_driver(&driver); -} - -static void __exit alsa_card_mixart_exit(void) -{ - pci_unregister_driver(&driver); -} - -module_init(alsa_card_mixart_init) -module_exit(alsa_card_mixart_exit) +module_pci_driver(mixart_driver); |
