aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1/emu10k1.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/emu10k1/emu10k1.c')
-rw-r--r--sound/pci/emu10k1/emu10k1.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index a168138efc5e..8c5010f7889c 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -99,8 +99,8 @@ static DEFINE_PCI_DEVICE_TABLE(snd_emu10k1_ids) = {
99 99
100MODULE_DEVICE_TABLE(pci, snd_emu10k1_ids); 100MODULE_DEVICE_TABLE(pci, snd_emu10k1_ids);
101 101
102static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci, 102static int snd_card_emu10k1_probe(struct pci_dev *pci,
103 const struct pci_device_id *pci_id) 103 const struct pci_device_id *pci_id)
104{ 104{
105 static int dev; 105 static int dev;
106 struct snd_card *card; 106 struct snd_card *card;
@@ -199,7 +199,7 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,
199 return err; 199 return err;
200} 200}
201 201
202static void __devexit snd_card_emu10k1_remove(struct pci_dev *pci) 202static void snd_card_emu10k1_remove(struct pci_dev *pci)
203{ 203{
204 snd_card_free(pci_get_drvdata(pci)); 204 snd_card_free(pci_get_drvdata(pci));
205 pci_set_drvdata(pci, NULL); 205 pci_set_drvdata(pci, NULL);
@@ -278,7 +278,7 @@ static struct pci_driver emu10k1_driver = {
278 .name = KBUILD_MODNAME, 278 .name = KBUILD_MODNAME,
279 .id_table = snd_emu10k1_ids, 279 .id_table = snd_emu10k1_ids,
280 .probe = snd_card_emu10k1_probe, 280 .probe = snd_card_emu10k1_probe,
281 .remove = __devexit_p(snd_card_emu10k1_remove), 281 .remove = snd_card_emu10k1_remove,
282 .driver = { 282 .driver = {
283 .pm = SND_EMU10K1_PM_OPS, 283 .pm = SND_EMU10K1_PM_OPS,
284 }, 284 },