aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/als4000.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/als4000.c')
-rw-r--r--sound/pci/als4000.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index feb2a1436830..61efda2a4d94 100644
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -694,7 +694,7 @@ static struct snd_pcm_ops snd_als4000_capture_ops = {
694 .pointer = snd_als4000_capture_pointer 694 .pointer = snd_als4000_capture_pointer
695}; 695};
696 696
697static int __devinit snd_als4000_pcm(struct snd_sb *chip, int device) 697static int snd_als4000_pcm(struct snd_sb *chip, int device)
698{ 698{
699 struct snd_pcm *pcm; 699 struct snd_pcm *pcm;
700 int err; 700 int err;
@@ -770,7 +770,7 @@ static void snd_als4000_configure(struct snd_sb *chip)
770} 770}
771 771
772#ifdef SUPPORT_JOYSTICK 772#ifdef SUPPORT_JOYSTICK
773static int __devinit snd_als4000_create_gameport(struct snd_card_als4000 *acard, int dev) 773static int snd_als4000_create_gameport(struct snd_card_als4000 *acard, int dev)
774{ 774{
775 struct gameport *gp; 775 struct gameport *gp;
776 struct resource *r; 776 struct resource *r;
@@ -847,8 +847,8 @@ static void snd_card_als4000_free( struct snd_card *card )
847 pci_disable_device(acard->pci); 847 pci_disable_device(acard->pci);
848} 848}
849 849
850static int __devinit snd_card_als4000_probe(struct pci_dev *pci, 850static int snd_card_als4000_probe(struct pci_dev *pci,
851 const struct pci_device_id *pci_id) 851 const struct pci_device_id *pci_id)
852{ 852{
853 static int dev; 853 static int dev;
854 struct snd_card *card; 854 struct snd_card *card;
@@ -981,7 +981,7 @@ out:
981 return err; 981 return err;
982} 982}
983 983
984static void __devexit snd_card_als4000_remove(struct pci_dev *pci) 984static void snd_card_als4000_remove(struct pci_dev *pci)
985{ 985{
986 snd_card_free(pci_get_drvdata(pci)); 986 snd_card_free(pci_get_drvdata(pci));
987 pci_set_drvdata(pci, NULL); 987 pci_set_drvdata(pci, NULL);
@@ -1046,7 +1046,7 @@ static struct pci_driver als4000_driver = {
1046 .name = KBUILD_MODNAME, 1046 .name = KBUILD_MODNAME,
1047 .id_table = snd_als4000_ids, 1047 .id_table = snd_als4000_ids,
1048 .probe = snd_card_als4000_probe, 1048 .probe = snd_card_als4000_probe,
1049 .remove = __devexit_p(snd_card_als4000_remove), 1049 .remove = snd_card_als4000_remove,
1050 .driver = { 1050 .driver = {
1051 .pm = SND_ALS4000_PM_OPS, 1051 .pm = SND_ALS4000_PM_OPS,
1052 }, 1052 },