diff options
Diffstat (limited to 'sound/pci/ca0106/ca0106_main.c')
-rw-r--r-- | sound/pci/ca0106/ca0106_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 65c55910566b..1610a5705970 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
@@ -1352,7 +1352,7 @@ static const struct snd_pcm_chmap_elem side_map[] = { | |||
1352 | { } | 1352 | { } |
1353 | }; | 1353 | }; |
1354 | 1354 | ||
1355 | static int __devinit snd_ca0106_pcm(struct snd_ca0106 *emu, int device) | 1355 | static int snd_ca0106_pcm(struct snd_ca0106 *emu, int device) |
1356 | { | 1356 | { |
1357 | struct snd_pcm *pcm; | 1357 | struct snd_pcm *pcm; |
1358 | struct snd_pcm_substream *substream; | 1358 | struct snd_pcm_substream *substream; |
@@ -1650,7 +1650,7 @@ static void ca0106_stop_chip(struct snd_ca0106 *chip) | |||
1650 | */ | 1650 | */ |
1651 | } | 1651 | } |
1652 | 1652 | ||
1653 | static int __devinit snd_ca0106_create(int dev, struct snd_card *card, | 1653 | static int snd_ca0106_create(int dev, struct snd_card *card, |
1654 | struct pci_dev *pci, | 1654 | struct pci_dev *pci, |
1655 | struct snd_ca0106 **rchip) | 1655 | struct snd_ca0106 **rchip) |
1656 | { | 1656 | { |
@@ -1777,7 +1777,7 @@ static int ca0106_dev_id_port(void *dev_id) | |||
1777 | return ((struct snd_ca0106 *)dev_id)->port; | 1777 | return ((struct snd_ca0106 *)dev_id)->port; |
1778 | } | 1778 | } |
1779 | 1779 | ||
1780 | static int __devinit snd_ca0106_midi(struct snd_ca0106 *chip, unsigned int channel) | 1780 | static int snd_ca0106_midi(struct snd_ca0106 *chip, unsigned int channel) |
1781 | { | 1781 | { |
1782 | struct snd_ca_midi *midi; | 1782 | struct snd_ca_midi *midi; |
1783 | char *name; | 1783 | char *name; |
@@ -1828,7 +1828,7 @@ static int __devinit snd_ca0106_midi(struct snd_ca0106 *chip, unsigned int chann | |||
1828 | } | 1828 | } |
1829 | 1829 | ||
1830 | 1830 | ||
1831 | static int __devinit snd_ca0106_probe(struct pci_dev *pci, | 1831 | static int snd_ca0106_probe(struct pci_dev *pci, |
1832 | const struct pci_device_id *pci_id) | 1832 | const struct pci_device_id *pci_id) |
1833 | { | 1833 | { |
1834 | static int dev; | 1834 | static int dev; |
@@ -1893,7 +1893,7 @@ static int __devinit snd_ca0106_probe(struct pci_dev *pci, | |||
1893 | return err; | 1893 | return err; |
1894 | } | 1894 | } |
1895 | 1895 | ||
1896 | static void __devexit snd_ca0106_remove(struct pci_dev *pci) | 1896 | static void snd_ca0106_remove(struct pci_dev *pci) |
1897 | { | 1897 | { |
1898 | snd_card_free(pci_get_drvdata(pci)); | 1898 | snd_card_free(pci_get_drvdata(pci)); |
1899 | pci_set_drvdata(pci, NULL); | 1899 | pci_set_drvdata(pci, NULL); |
@@ -1971,7 +1971,7 @@ static struct pci_driver ca0106_driver = { | |||
1971 | .name = KBUILD_MODNAME, | 1971 | .name = KBUILD_MODNAME, |
1972 | .id_table = snd_ca0106_ids, | 1972 | .id_table = snd_ca0106_ids, |
1973 | .probe = snd_ca0106_probe, | 1973 | .probe = snd_ca0106_probe, |
1974 | .remove = __devexit_p(snd_ca0106_remove), | 1974 | .remove = snd_ca0106_remove, |
1975 | .driver = { | 1975 | .driver = { |
1976 | .pm = SND_CA0106_PM_OPS, | 1976 | .pm = SND_CA0106_PM_OPS, |
1977 | }, | 1977 | }, |