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/emu10k1/emu10k1x.c | |
parent | 6de15b2a9330aeb5df9b66545f67c6c6ad2c045a (diff) | |
parent | 97f8d3b6503082416898f893a442a78f8819c42a (diff) |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/emu10k1/emu10k1x.c')
-rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 47a651cb6e8..5c8978b2c4d 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c @@ -1612,24 +1612,11 @@ static DEFINE_PCI_DEVICE_TABLE(snd_emu10k1x_ids) = { MODULE_DEVICE_TABLE(pci, snd_emu10k1x_ids); // pci_driver definition -static struct pci_driver driver = { +static struct pci_driver emu10k1x_driver = { .name = KBUILD_MODNAME, .id_table = snd_emu10k1x_ids, .probe = snd_emu10k1x_probe, .remove = __devexit_p(snd_emu10k1x_remove), }; -// initialization of the module -static int __init alsa_card_emu10k1x_init(void) -{ - return pci_register_driver(&driver); -} - -// clean up the module -static void __exit alsa_card_emu10k1x_exit(void) -{ - pci_unregister_driver(&driver); -} - -module_init(alsa_card_emu10k1x_init) -module_exit(alsa_card_emu10k1x_exit) +module_pci_driver(emu10k1x_driver); |