diff options
Diffstat (limited to 'sound/isa/ad1848/ad1848.c')
-rw-r--r-- | sound/isa/ad1848/ad1848.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c index 2af77faefbb1..c214ecf45400 100644 --- a/sound/isa/ad1848/ad1848.c +++ b/sound/isa/ad1848/ad1848.c | |||
@@ -64,7 +64,7 @@ MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver."); | |||
64 | module_param_array(thinkpad, bool, NULL, 0444); | 64 | module_param_array(thinkpad, bool, NULL, 0444); |
65 | MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series."); | 65 | MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series."); |
66 | 66 | ||
67 | static int __devinit snd_ad1848_match(struct device *dev, unsigned int n) | 67 | static int snd_ad1848_match(struct device *dev, unsigned int n) |
68 | { | 68 | { |
69 | if (!enable[n]) | 69 | if (!enable[n]) |
70 | return 0; | 70 | return 0; |
@@ -84,7 +84,7 @@ static int __devinit snd_ad1848_match(struct device *dev, unsigned int n) | |||
84 | return 1; | 84 | return 1; |
85 | } | 85 | } |
86 | 86 | ||
87 | static int __devinit snd_ad1848_probe(struct device *dev, unsigned int n) | 87 | static int snd_ad1848_probe(struct device *dev, unsigned int n) |
88 | { | 88 | { |
89 | struct snd_card *card; | 89 | struct snd_card *card; |
90 | struct snd_wss *chip; | 90 | struct snd_wss *chip; |
@@ -132,7 +132,7 @@ out: snd_card_free(card); | |||
132 | return error; | 132 | return error; |
133 | } | 133 | } |
134 | 134 | ||
135 | static int __devexit snd_ad1848_remove(struct device *dev, unsigned int n) | 135 | static int snd_ad1848_remove(struct device *dev, unsigned int n) |
136 | { | 136 | { |
137 | snd_card_free(dev_get_drvdata(dev)); | 137 | snd_card_free(dev_get_drvdata(dev)); |
138 | dev_set_drvdata(dev, NULL); | 138 | dev_set_drvdata(dev, NULL); |
@@ -164,7 +164,7 @@ static int snd_ad1848_resume(struct device *dev, unsigned int n) | |||
164 | static struct isa_driver snd_ad1848_driver = { | 164 | static struct isa_driver snd_ad1848_driver = { |
165 | .match = snd_ad1848_match, | 165 | .match = snd_ad1848_match, |
166 | .probe = snd_ad1848_probe, | 166 | .probe = snd_ad1848_probe, |
167 | .remove = __devexit_p(snd_ad1848_remove), | 167 | .remove = snd_ad1848_remove, |
168 | #ifdef CONFIG_PM | 168 | #ifdef CONFIG_PM |
169 | .suspend = snd_ad1848_suspend, | 169 | .suspend = snd_ad1848_suspend, |
170 | .resume = snd_ad1848_resume, | 170 | .resume = snd_ad1848_resume, |