aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/oxygen/oxygen_lib.c10
-rw-r--r--sound/pci/oxygen/oxygen_pcm.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 6eb36dd11476..78c21155218e 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -204,7 +204,7 @@ static void oxygen_proc_read(struct snd_info_entry *entry,
204 mutex_unlock(&chip->mutex); 204 mutex_unlock(&chip->mutex);
205} 205}
206 206
207static void __devinit oxygen_proc_init(struct oxygen *chip) 207static void oxygen_proc_init(struct oxygen *chip)
208{ 208{
209 struct snd_info_entry *entry; 209 struct snd_info_entry *entry;
210 210
@@ -215,7 +215,7 @@ static void __devinit oxygen_proc_init(struct oxygen *chip)
215#define oxygen_proc_init(chip) 215#define oxygen_proc_init(chip)
216#endif 216#endif
217 217
218static void __devinit oxygen_init(struct oxygen *chip) 218static void oxygen_init(struct oxygen *chip)
219{ 219{
220 unsigned int i; 220 unsigned int i;
221 221
@@ -399,8 +399,8 @@ static void oxygen_card_free(struct snd_card *card)
399 pci_disable_device(chip->pci); 399 pci_disable_device(chip->pci);
400} 400}
401 401
402int __devinit oxygen_pci_probe(struct pci_dev *pci, int index, char *id, 402int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
403 int midi, const struct oxygen_model *model) 403 int midi, const struct oxygen_model *model)
404{ 404{
405 struct snd_card *card; 405 struct snd_card *card;
406 struct oxygen *chip; 406 struct oxygen *chip;
@@ -507,7 +507,7 @@ err_card:
507} 507}
508EXPORT_SYMBOL(oxygen_pci_probe); 508EXPORT_SYMBOL(oxygen_pci_probe);
509 509
510void __devexit oxygen_pci_remove(struct pci_dev *pci) 510void oxygen_pci_remove(struct pci_dev *pci)
511{ 511{
512 snd_card_free(pci_get_drvdata(pci)); 512 snd_card_free(pci_get_drvdata(pci));
513 pci_set_drvdata(pci, NULL); 513 pci_set_drvdata(pci, NULL);
diff --git a/sound/pci/oxygen/oxygen_pcm.c b/sound/pci/oxygen/oxygen_pcm.c
index dfad3db35c82..b70046aca657 100644
--- a/sound/pci/oxygen/oxygen_pcm.c
+++ b/sound/pci/oxygen/oxygen_pcm.c
@@ -634,7 +634,7 @@ static void oxygen_pcm_free(struct snd_pcm *pcm)
634 snd_pcm_lib_preallocate_free_for_all(pcm); 634 snd_pcm_lib_preallocate_free_for_all(pcm);
635} 635}
636 636
637int __devinit oxygen_pcm_init(struct oxygen *chip) 637int oxygen_pcm_init(struct oxygen *chip)
638{ 638{
639 struct snd_pcm *pcm; 639 struct snd_pcm *pcm;
640 int outs, ins; 640 int outs, ins;