aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-06 12:35:21 -0500
committerTakashi Iwai <tiwai@suse.de>2012-12-07 01:32:17 -0500
commit1bff292e9abec7477d43abb2b93c7fd26c44859b (patch)
tree6c9a58a0f5aacf99a3ee4a964b1fefd4470b0893
parentf120a6fb486c2500c9ae11fd2da11fbde29bc186 (diff)
ALSA: isa: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat
-rw-r--r--sound/isa/ad1816a/ad1816a.c18
-rw-r--r--sound/isa/ad1816a/ad1816a_lib.c19
-rw-r--r--sound/isa/ad1848/ad1848.c8
-rw-r--r--sound/isa/adlib.c8
-rw-r--r--sound/isa/als100.c22
-rw-r--r--sound/isa/azt2320.c26
-rw-r--r--sound/isa/cmi8328.c8
-rw-r--r--sound/isa/cmi8330.c42
-rw-r--r--sound/isa/cs423x/cs4231.c8
-rw-r--r--sound/isa/cs423x/cs4236.c50
-rw-r--r--sound/isa/es1688/es1688.c28
-rw-r--r--sound/isa/es18xx.c80
-rw-r--r--sound/isa/galaxy/galaxy.c26
-rw-r--r--sound/isa/gus/gusclassic.c15
-rw-r--r--sound/isa/gus/gusextreme.c24
-rw-r--r--sound/isa/gus/gusmax.c16
-rw-r--r--sound/isa/gus/interwave.c54
-rw-r--r--sound/isa/msnd/msnd.h2
-rw-r--r--sound/isa/msnd/msnd_pinnacle.c44
-rw-r--r--sound/isa/msnd/msnd_pinnacle_mixer.c2
-rw-r--r--sound/isa/opl3sa2.c40
-rw-r--r--sound/isa/opti9xx/miro.c68
-rw-r--r--sound/isa/opti9xx/opti92x-ad1848.c42
-rw-r--r--sound/isa/sb/emu8000.c22
-rw-r--r--sound/isa/sb/jazz16.c18
-rw-r--r--sound/isa/sb/sb16.c26
-rw-r--r--sound/isa/sb/sb8.c8
-rw-r--r--sound/isa/sc6000.c38
-rw-r--r--sound/isa/sscape.c32
-rw-r--r--sound/isa/wavefront/wavefront.c53
-rw-r--r--sound/isa/wavefront/wavefront_fx.c2
-rw-r--r--sound/isa/wavefront/wavefront_midi.c2
-rw-r--r--sound/isa/wavefront/wavefront_synth.c14
33 files changed, 433 insertions, 432 deletions
diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index 2c2f829c3fd..26ce26a5884 100644
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@ -94,8 +94,8 @@ MODULE_DEVICE_TABLE(pnp_card, snd_ad1816a_pnpids);
94#define DRIVER_NAME "snd-card-ad1816a" 94#define DRIVER_NAME "snd-card-ad1816a"
95 95
96 96
97static int __devinit snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card, 97static int snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card,
98 const struct pnp_card_device_id *id) 98 const struct pnp_card_device_id *id)
99{ 99{
100 struct pnp_dev *pdev; 100 struct pnp_dev *pdev;
101 int err; 101 int err;
@@ -135,8 +135,8 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card,
135 return 0; 135 return 0;
136} 136}
137 137
138static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard, 138static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,
139 const struct pnp_card_device_id *pid) 139 const struct pnp_card_device_id *pid)
140{ 140{
141 int error; 141 int error;
142 struct snd_card *card; 142 struct snd_card *card;
@@ -217,10 +217,10 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
217 return 0; 217 return 0;
218} 218}
219 219
220static unsigned int __devinitdata ad1816a_devices; 220static unsigned int ad1816a_devices;
221 221
222static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card, 222static int snd_ad1816a_pnp_detect(struct pnp_card_link *card,
223 const struct pnp_card_device_id *id) 223 const struct pnp_card_device_id *id)
224{ 224{
225 static int dev; 225 static int dev;
226 int res; 226 int res;
@@ -238,7 +238,7 @@ static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card,
238 return -ENODEV; 238 return -ENODEV;
239} 239}
240 240
241static void __devexit snd_ad1816a_pnp_remove(struct pnp_card_link * pcard) 241static void snd_ad1816a_pnp_remove(struct pnp_card_link *pcard)
242{ 242{
243 snd_card_free(pnp_get_card_drvdata(pcard)); 243 snd_card_free(pnp_get_card_drvdata(pcard));
244 pnp_set_card_drvdata(pcard, NULL); 244 pnp_set_card_drvdata(pcard, NULL);
@@ -270,7 +270,7 @@ static struct pnp_card_driver ad1816a_pnpc_driver = {
270 .name = "ad1816a", 270 .name = "ad1816a",
271 .id_table = snd_ad1816a_pnpids, 271 .id_table = snd_ad1816a_pnpids,
272 .probe = snd_ad1816a_pnp_detect, 272 .probe = snd_ad1816a_pnp_detect,
273 .remove = __devexit_p(snd_ad1816a_pnp_remove), 273 .remove = snd_ad1816a_pnp_remove,
274#ifdef CONFIG_PM 274#ifdef CONFIG_PM
275 .suspend = snd_ad1816a_pnp_suspend, 275 .suspend = snd_ad1816a_pnp_suspend,
276 .resume = snd_ad1816a_pnp_resume, 276 .resume = snd_ad1816a_pnp_resume,
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index db64df6023e..f0fd98e695e 100644
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -537,7 +537,7 @@ void snd_ad1816a_resume(struct snd_ad1816a *chip)
537} 537}
538#endif 538#endif
539 539
540static int __devinit snd_ad1816a_probe(struct snd_ad1816a *chip) 540static int snd_ad1816a_probe(struct snd_ad1816a *chip)
541{ 541{
542 unsigned long flags; 542 unsigned long flags;
543 543
@@ -583,7 +583,7 @@ static int snd_ad1816a_dev_free(struct snd_device *device)
583 return snd_ad1816a_free(chip); 583 return snd_ad1816a_free(chip);
584} 584}
585 585
586static const char __devinit *snd_ad1816a_chip_id(struct snd_ad1816a *chip) 586static const char *snd_ad1816a_chip_id(struct snd_ad1816a *chip)
587{ 587{
588 switch (chip->hardware) { 588 switch (chip->hardware) {
589 case AD1816A_HW_AD1816A: return "AD1816A"; 589 case AD1816A_HW_AD1816A: return "AD1816A";
@@ -596,9 +596,9 @@ static const char __devinit *snd_ad1816a_chip_id(struct snd_ad1816a *chip)
596 } 596 }
597} 597}
598 598
599int __devinit snd_ad1816a_create(struct snd_card *card, 599int snd_ad1816a_create(struct snd_card *card,
600 unsigned long port, int irq, int dma1, int dma2, 600 unsigned long port, int irq, int dma1, int dma2,
601 struct snd_ad1816a *chip) 601 struct snd_ad1816a *chip)
602{ 602{
603 static struct snd_device_ops ops = { 603 static struct snd_device_ops ops = {
604 .dev_free = snd_ad1816a_dev_free, 604 .dev_free = snd_ad1816a_dev_free,
@@ -675,7 +675,7 @@ static struct snd_pcm_ops snd_ad1816a_capture_ops = {
675 .pointer = snd_ad1816a_capture_pointer, 675 .pointer = snd_ad1816a_capture_pointer,
676}; 676};
677 677
678int __devinit snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm) 678int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm)
679{ 679{
680 int error; 680 int error;
681 struct snd_pcm *pcm; 681 struct snd_pcm *pcm;
@@ -702,7 +702,8 @@ int __devinit snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_p
702 return 0; 702 return 0;
703} 703}
704 704
705int __devinit snd_ad1816a_timer(struct snd_ad1816a *chip, int device, struct snd_timer **rtimer) 705int snd_ad1816a_timer(struct snd_ad1816a *chip, int device,
706 struct snd_timer **rtimer)
706{ 707{
707 struct snd_timer *timer; 708 struct snd_timer *timer;
708 struct snd_timer_id tid; 709 struct snd_timer_id tid;
@@ -923,7 +924,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_6bit, -9450, 150, 0);
923static const DECLARE_TLV_DB_SCALE(db_scale_5bit_12db_max, -3450, 150, 0); 924static const DECLARE_TLV_DB_SCALE(db_scale_5bit_12db_max, -3450, 150, 0);
924static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0); 925static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0);
925 926
926static struct snd_kcontrol_new snd_ad1816a_controls[] __devinitdata = { 927static struct snd_kcontrol_new snd_ad1816a_controls[] = {
927AD1816A_DOUBLE("Master Playback Switch", AD1816A_MASTER_ATT, 15, 7, 1, 1), 928AD1816A_DOUBLE("Master Playback Switch", AD1816A_MASTER_ATT, 15, 7, 1, 1),
928AD1816A_DOUBLE_TLV("Master Playback Volume", AD1816A_MASTER_ATT, 8, 0, 31, 1, 929AD1816A_DOUBLE_TLV("Master Playback Volume", AD1816A_MASTER_ATT, 8, 0, 31, 1,
929 db_scale_5bit), 930 db_scale_5bit),
@@ -969,7 +970,7 @@ AD1816A_SINGLE("3D Control - Switch", AD1816A_3D_PHAT_CTRL, 15, 1, 1),
969AD1816A_SINGLE("3D Control - Level", AD1816A_3D_PHAT_CTRL, 0, 15, 0), 970AD1816A_SINGLE("3D Control - Level", AD1816A_3D_PHAT_CTRL, 0, 15, 0),
970}; 971};
971 972
972int __devinit snd_ad1816a_mixer(struct snd_ad1816a *chip) 973int snd_ad1816a_mixer(struct snd_ad1816a *chip)
973{ 974{
974 struct snd_card *card; 975 struct snd_card *card;
975 unsigned int idx; 976 unsigned int idx;
diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c
index 2af77faefbb..c214ecf4540 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.");
64module_param_array(thinkpad, bool, NULL, 0444); 64module_param_array(thinkpad, bool, NULL, 0444);
65MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series."); 65MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series.");
66 66
67static int __devinit snd_ad1848_match(struct device *dev, unsigned int n) 67static 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
87static int __devinit snd_ad1848_probe(struct device *dev, unsigned int n) 87static 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
135static int __devexit snd_ad1848_remove(struct device *dev, unsigned int n) 135static 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)
164static struct isa_driver snd_ad1848_driver = { 164static 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,
diff --git a/sound/isa/adlib.c b/sound/isa/adlib.c
index 4d50c69f329..d2654554373 100644
--- a/sound/isa/adlib.c
+++ b/sound/isa/adlib.c
@@ -30,7 +30,7 @@ MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");
30module_param_array(port, long, NULL, 0444); 30module_param_array(port, long, NULL, 0444);
31MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver."); 31MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");
32 32
33static int __devinit snd_adlib_match(struct device *dev, unsigned int n) 33static int snd_adlib_match(struct device *dev, unsigned int n)
34{ 34{
35 if (!enable[n]) 35 if (!enable[n])
36 return 0; 36 return 0;
@@ -47,7 +47,7 @@ static void snd_adlib_free(struct snd_card *card)
47 release_and_free_resource(card->private_data); 47 release_and_free_resource(card->private_data);
48} 48}
49 49
50static int __devinit snd_adlib_probe(struct device *dev, unsigned int n) 50static int snd_adlib_probe(struct device *dev, unsigned int n)
51{ 51{
52 struct snd_card *card; 52 struct snd_card *card;
53 struct snd_opl3 *opl3; 53 struct snd_opl3 *opl3;
@@ -98,7 +98,7 @@ out: snd_card_free(card);
98 return error; 98 return error;
99} 99}
100 100
101static int __devexit snd_adlib_remove(struct device *dev, unsigned int n) 101static int snd_adlib_remove(struct device *dev, unsigned int n)
102{ 102{
103 snd_card_free(dev_get_drvdata(dev)); 103 snd_card_free(dev_get_drvdata(dev));
104 dev_set_drvdata(dev, NULL); 104 dev_set_drvdata(dev, NULL);
@@ -108,7 +108,7 @@ static int __devexit snd_adlib_remove(struct device *dev, unsigned int n)
108static struct isa_driver snd_adlib_driver = { 108static struct isa_driver snd_adlib_driver = {
109 .match = snd_adlib_match, 109 .match = snd_adlib_match,
110 .probe = snd_adlib_probe, 110 .probe = snd_adlib_probe,
111 .remove = __devexit_p(snd_adlib_remove), 111 .remove = snd_adlib_remove,
112 112
113 .driver = { 113 .driver = {
114 .name = DEV_NAME 114 .name = DEV_NAME
diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index f7cdaf51512..10f08a18fe3 100644
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -117,9 +117,9 @@ static struct pnp_card_device_id snd_als100_pnpids[] = {
117 117
118MODULE_DEVICE_TABLE(pnp_card, snd_als100_pnpids); 118MODULE_DEVICE_TABLE(pnp_card, snd_als100_pnpids);
119 119
120static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard, 120static int snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,
121 struct pnp_card_link *card, 121 struct pnp_card_link *card,
122 const struct pnp_card_device_id *id) 122 const struct pnp_card_device_id *id)
123{ 123{
124 struct pnp_dev *pdev; 124 struct pnp_dev *pdev;
125 int err; 125 int err;
@@ -183,9 +183,9 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,
183 return 0; 183 return 0;
184} 184}
185 185
186static int __devinit snd_card_als100_probe(int dev, 186static int snd_card_als100_probe(int dev,
187 struct pnp_card_link *pcard, 187 struct pnp_card_link *pcard,
188 const struct pnp_card_device_id *pid) 188 const struct pnp_card_device_id *pid)
189{ 189{
190 int error; 190 int error;
191 struct snd_sb *chip; 191 struct snd_sb *chip;
@@ -286,10 +286,10 @@ static int __devinit snd_card_als100_probe(int dev,
286 return 0; 286 return 0;
287} 287}
288 288
289static unsigned int __devinitdata als100_devices; 289static unsigned int als100_devices;
290 290
291static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card, 291static int snd_als100_pnp_detect(struct pnp_card_link *card,
292 const struct pnp_card_device_id *id) 292 const struct pnp_card_device_id *id)
293{ 293{
294 static int dev; 294 static int dev;
295 int res; 295 int res;
@@ -307,7 +307,7 @@ static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,
307 return -ENODEV; 307 return -ENODEV;
308} 308}
309 309
310static void __devexit snd_als100_pnp_remove(struct pnp_card_link * pcard) 310static void snd_als100_pnp_remove(struct pnp_card_link *pcard)
311{ 311{
312 snd_card_free(pnp_get_card_drvdata(pcard)); 312 snd_card_free(pnp_get_card_drvdata(pcard));
313 pnp_set_card_drvdata(pcard, NULL); 313 pnp_set_card_drvdata(pcard, NULL);
@@ -344,7 +344,7 @@ static struct pnp_card_driver als100_pnpc_driver = {
344 .name = "als100", 344 .name = "als100",
345 .id_table = snd_als100_pnpids, 345 .id_table = snd_als100_pnpids,
346 .probe = snd_als100_pnp_detect, 346 .probe = snd_als100_pnp_detect,
347 .remove = __devexit_p(snd_als100_pnp_remove), 347 .remove = snd_als100_pnp_remove,
348#ifdef CONFIG_PM 348#ifdef CONFIG_PM
349 .suspend = snd_als100_pnp_suspend, 349 .suspend = snd_als100_pnp_suspend,
350 .resume = snd_als100_pnp_resume, 350 .resume = snd_als100_pnp_resume,
diff --git a/sound/isa/azt2320.c b/sound/isa/azt2320.c
index 6a2c78ef1d8..db301ff94ec 100644
--- a/sound/isa/azt2320.c
+++ b/sound/isa/azt2320.c
@@ -99,9 +99,9 @@ MODULE_DEVICE_TABLE(pnp_card, snd_azt2320_pnpids);
99 99
100#define DRIVER_NAME "snd-card-azt2320" 100#define DRIVER_NAME "snd-card-azt2320"
101 101
102static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acard, 102static int snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acard,
103 struct pnp_card_link *card, 103 struct pnp_card_link *card,
104 const struct pnp_card_device_id *id) 104 const struct pnp_card_device_id *id)
105{ 105{
106 struct pnp_dev *pdev; 106 struct pnp_dev *pdev;
107 int err; 107 int err;
@@ -147,7 +147,7 @@ static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acar
147} 147}
148 148
149/* same of snd_sbdsp_command by Jaroslav Kysela */ 149/* same of snd_sbdsp_command by Jaroslav Kysela */
150static int __devinit snd_card_azt2320_command(unsigned long port, unsigned char val) 150static int snd_card_azt2320_command(unsigned long port, unsigned char val)
151{ 151{
152 int i; 152 int i;
153 unsigned long limit; 153 unsigned long limit;
@@ -161,7 +161,7 @@ static int __devinit snd_card_azt2320_command(unsigned long port, unsigned char
161 return -EBUSY; 161 return -EBUSY;
162} 162}
163 163
164static int __devinit snd_card_azt2320_enable_wss(unsigned long port) 164static int snd_card_azt2320_enable_wss(unsigned long port)
165{ 165{
166 int error; 166 int error;
167 167
@@ -174,9 +174,9 @@ static int __devinit snd_card_azt2320_enable_wss(unsigned long port)
174 return 0; 174 return 0;
175} 175}
176 176
177static int __devinit snd_card_azt2320_probe(int dev, 177static int snd_card_azt2320_probe(int dev,
178 struct pnp_card_link *pcard, 178 struct pnp_card_link *pcard,
179 const struct pnp_card_device_id *pid) 179 const struct pnp_card_device_id *pid)
180{ 180{
181 int error; 181 int error;
182 struct snd_card *card; 182 struct snd_card *card;
@@ -264,10 +264,10 @@ static int __devinit snd_card_azt2320_probe(int dev,
264 return 0; 264 return 0;
265} 265}
266 266
267static unsigned int __devinitdata azt2320_devices; 267static unsigned int azt2320_devices;
268 268
269static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card, 269static int snd_azt2320_pnp_detect(struct pnp_card_link *card,
270 const struct pnp_card_device_id *id) 270 const struct pnp_card_device_id *id)
271{ 271{
272 static int dev; 272 static int dev;
273 int res; 273 int res;
@@ -285,7 +285,7 @@ static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,
285 return -ENODEV; 285 return -ENODEV;
286} 286}
287 287
288static void __devexit snd_azt2320_pnp_remove(struct pnp_card_link * pcard) 288static void snd_azt2320_pnp_remove(struct pnp_card_link *pcard)
289{ 289{
290 snd_card_free(pnp_get_card_drvdata(pcard)); 290 snd_card_free(pnp_get_card_drvdata(pcard));
291 pnp_set_card_drvdata(pcard, NULL); 291 pnp_set_card_drvdata(pcard, NULL);
@@ -320,7 +320,7 @@ static struct pnp_card_driver azt2320_pnpc_driver = {
320 .name = "azt2320", 320 .name = "azt2320",
321 .id_table = snd_azt2320_pnpids, 321 .id_table = snd_azt2320_pnpids,
322 .probe = snd_azt2320_pnp_detect, 322 .probe = snd_azt2320_pnp_detect,
323 .remove = __devexit_p(snd_azt2320_pnp_remove), 323 .remove = snd_azt2320_pnp_remove,
324#ifdef CONFIG_PM 324#ifdef CONFIG_PM
325 .suspend = snd_azt2320_pnp_suspend, 325 .suspend = snd_azt2320_pnp_suspend,
326 .resume = snd_azt2320_pnp_resume, 326 .resume = snd_azt2320_pnp_resume,
diff --git a/sound/isa/cmi8328.c b/sound/isa/cmi8328.c
index bde60139bb9..a7369fe19a6 100644
--- a/sound/isa/cmi8328.c
+++ b/sound/isa/cmi8328.c
@@ -140,7 +140,7 @@ static void snd_cmi8328_cfg_restore(u16 port, u8 cfg[])
140 snd_cmi8328_cfg_write(port, CFG3, cfg[2]); 140 snd_cmi8328_cfg_write(port, CFG3, cfg[2]);
141} 141}
142 142
143static int __devinit snd_cmi8328_mixer(struct snd_wss *chip) 143static int snd_cmi8328_mixer(struct snd_wss *chip)
144{ 144{
145 struct snd_card *card; 145 struct snd_card *card;
146 struct snd_ctl_elem_id id1, id2; 146 struct snd_ctl_elem_id id1, id2;
@@ -212,7 +212,7 @@ int array_find_l(long array[], long item)
212 return -1; 212 return -1;
213} 213}
214 214
215static int __devinit snd_cmi8328_probe(struct device *pdev, unsigned int ndev) 215static int snd_cmi8328_probe(struct device *pdev, unsigned int ndev)
216{ 216{
217 struct snd_card *card; 217 struct snd_card *card;
218 struct snd_opl3 *opl3; 218 struct snd_opl3 *opl3;
@@ -401,7 +401,7 @@ error:
401 return err; 401 return err;
402} 402}
403 403
404static int __devexit snd_cmi8328_remove(struct device *pdev, unsigned int dev) 404static int snd_cmi8328_remove(struct device *pdev, unsigned int dev)
405{ 405{
406 struct snd_card *card = dev_get_drvdata(pdev); 406 struct snd_card *card = dev_get_drvdata(pdev);
407 struct snd_cmi8328 *cmi = card->private_data; 407 struct snd_cmi8328 *cmi = card->private_data;
@@ -459,7 +459,7 @@ static int snd_cmi8328_resume(struct device *pdev, unsigned int n)
459 459
460static struct isa_driver snd_cmi8328_driver = { 460static struct isa_driver snd_cmi8328_driver = {
461 .probe = snd_cmi8328_probe, 461 .probe = snd_cmi8328_probe,
462 .remove = __devexit_p(snd_cmi8328_remove), 462 .remove = snd_cmi8328_remove,
463#ifdef CONFIG_PM 463#ifdef CONFIG_PM
464 .suspend = snd_cmi8328_suspend, 464 .suspend = snd_cmi8328_suspend,
465 .resume = snd_cmi8328_resume, 465 .resume = snd_cmi8328_resume,
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index 7bd5e337ee9..c707c52268a 100644
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -193,7 +193,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_cmi8330_pnpids);
193#endif 193#endif
194 194
195 195
196static struct snd_kcontrol_new snd_cmi8330_controls[] __devinitdata = { 196static struct snd_kcontrol_new snd_cmi8330_controls[] = {
197WSS_DOUBLE("Master Playback Volume", 0, 197WSS_DOUBLE("Master Playback Volume", 0,
198 CMI8330_MASTVOL, CMI8330_MASTVOL, 4, 0, 15, 0), 198 CMI8330_MASTVOL, CMI8330_MASTVOL, 4, 0, 15, 0),
199WSS_SINGLE("Loud Playback Switch", 0, 199WSS_SINGLE("Loud Playback Switch", 0,
@@ -249,7 +249,7 @@ WSS_SINGLE(SNDRV_CTL_NAME_IEC958("Input ", PLAYBACK, SWITCH), 0,
249}; 249};
250 250
251#ifdef ENABLE_SB_MIXER 251#ifdef ENABLE_SB_MIXER
252static struct sbmix_elem cmi8330_sb_mixers[] __devinitdata = { 252static struct sbmix_elem cmi8330_sb_mixers[] = {
253SB_DOUBLE("SB Master Playback Volume", SB_DSP4_MASTER_DEV, (SB_DSP4_MASTER_DEV + 1), 3, 3, 31), 253SB_DOUBLE("SB Master Playback Volume", SB_DSP4_MASTER_DEV, (SB_DSP4_MASTER_DEV + 1), 3, 3, 31),
254SB_DOUBLE("Tone Control - Bass", SB_DSP4_BASS_DEV, (SB_DSP4_BASS_DEV + 1), 4, 4, 15), 254SB_DOUBLE("Tone Control - Bass", SB_DSP4_BASS_DEV, (SB_DSP4_BASS_DEV + 1), 4, 4, 15),
255SB_DOUBLE("Tone Control - Treble", SB_DSP4_TREBLE_DEV, (SB_DSP4_TREBLE_DEV + 1), 4, 4, 15), 255SB_DOUBLE("Tone Control - Treble", SB_DSP4_TREBLE_DEV, (SB_DSP4_TREBLE_DEV + 1), 4, 4, 15),
@@ -267,7 +267,7 @@ SB_DOUBLE("SB Playback Volume", SB_DSP4_OGAIN_DEV, (SB_DSP4_OGAIN_DEV + 1), 6, 6
267SB_SINGLE("SB Mic Auto Gain", SB_DSP4_MIC_AGC, 0, 1), 267SB_SINGLE("SB Mic Auto Gain", SB_DSP4_MIC_AGC, 0, 1),
268}; 268};
269 269
270static unsigned char cmi8330_sb_init_values[][2] __devinitdata = { 270static unsigned char cmi8330_sb_init_values[][2] = {
271 { SB_DSP4_MASTER_DEV + 0, 0 }, 271 { SB_DSP4_MASTER_DEV + 0, 0 },
272 { SB_DSP4_MASTER_DEV + 1, 0 }, 272 { SB_DSP4_MASTER_DEV + 1, 0 },
273 { SB_DSP4_PCM_DEV + 0, 0 }, 273 { SB_DSP4_PCM_DEV + 0, 0 },
@@ -281,7 +281,7 @@ static unsigned char cmi8330_sb_init_values[][2] __devinitdata = {
281}; 281};
282 282
283 283
284static int __devinit cmi8330_add_sb_mixers(struct snd_sb *chip) 284static int cmi8330_add_sb_mixers(struct snd_sb *chip)
285{ 285{
286 int idx, err; 286 int idx, err;
287 unsigned long flags; 287 unsigned long flags;
@@ -306,7 +306,7 @@ static int __devinit cmi8330_add_sb_mixers(struct snd_sb *chip)
306} 306}
307#endif 307#endif
308 308
309static int __devinit snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330 *acard) 309static int snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330 *acard)
310{ 310{
311 unsigned int idx; 311 unsigned int idx;
312 int err; 312 int err;
@@ -329,9 +329,9 @@ static int __devinit snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330
329} 329}
330 330
331#ifdef CONFIG_PNP 331#ifdef CONFIG_PNP
332static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard, 332static int snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,
333 struct pnp_card_link *card, 333 struct pnp_card_link *card,
334 const struct pnp_card_device_id *id) 334 const struct pnp_card_device_id *id)
335{ 335{
336 struct pnp_dev *pdev; 336 struct pnp_dev *pdev;
337 int err; 337 int err;
@@ -437,7 +437,7 @@ static int snd_cmi8330_capture_open(struct snd_pcm_substream *substream)
437 return chip->streams[SNDRV_PCM_STREAM_CAPTURE].open(substream); 437 return chip->streams[SNDRV_PCM_STREAM_CAPTURE].open(substream);
438} 438}
439 439
440static int __devinit snd_cmi8330_pcm(struct snd_card *card, struct snd_cmi8330 *chip) 440static int snd_cmi8330_pcm(struct snd_card *card, struct snd_cmi8330 *chip)
441{ 441{
442 struct snd_pcm *pcm; 442 struct snd_pcm *pcm;
443 const struct snd_pcm_ops *ops; 443 const struct snd_pcm_ops *ops;
@@ -532,7 +532,7 @@ static int snd_cmi8330_card_new(int dev, struct snd_card **cardp)
532 return 0; 532 return 0;
533} 533}
534 534
535static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev) 535static int snd_cmi8330_probe(struct snd_card *card, int dev)
536{ 536{
537 struct snd_cmi8330 *acard; 537 struct snd_cmi8330 *acard;
538 int i, err; 538 int i, err;
@@ -613,8 +613,8 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)
613 return snd_card_register(card); 613 return snd_card_register(card);
614} 614}
615 615
616static int __devinit snd_cmi8330_isa_match(struct device *pdev, 616static int snd_cmi8330_isa_match(struct device *pdev,
617 unsigned int dev) 617 unsigned int dev)
618{ 618{
619 if (!enable[dev] || is_isapnp_selected(dev)) 619 if (!enable[dev] || is_isapnp_selected(dev))
620 return 0; 620 return 0;
@@ -629,8 +629,8 @@ static int __devinit snd_cmi8330_isa_match(struct device *pdev,
629 return 1; 629 return 1;
630} 630}
631 631
632static int __devinit snd_cmi8330_isa_probe(struct device *pdev, 632static int snd_cmi8330_isa_probe(struct device *pdev,
633 unsigned int dev) 633 unsigned int dev)
634{ 634{
635 struct snd_card *card; 635 struct snd_card *card;
636 int err; 636 int err;
@@ -647,8 +647,8 @@ static int __devinit snd_cmi8330_isa_probe(struct device *pdev,
647 return 0; 647 return 0;
648} 648}
649 649
650static int __devexit snd_cmi8330_isa_remove(struct device *devptr, 650static int snd_cmi8330_isa_remove(struct device *devptr,
651 unsigned int dev) 651 unsigned int dev)
652{ 652{
653 snd_card_free(dev_get_drvdata(devptr)); 653 snd_card_free(dev_get_drvdata(devptr));
654 dev_set_drvdata(devptr, NULL); 654 dev_set_drvdata(devptr, NULL);
@@ -673,7 +673,7 @@ static int snd_cmi8330_isa_resume(struct device *dev, unsigned int n)
673static struct isa_driver snd_cmi8330_driver = { 673static struct isa_driver snd_cmi8330_driver = {
674 .match = snd_cmi8330_isa_match, 674 .match = snd_cmi8330_isa_match,
675 .probe = snd_cmi8330_isa_probe, 675 .probe = snd_cmi8330_isa_probe,
676 .remove = __devexit_p(snd_cmi8330_isa_remove), 676 .remove = snd_cmi8330_isa_remove,
677#ifdef CONFIG_PM 677#ifdef CONFIG_PM
678 .suspend = snd_cmi8330_isa_suspend, 678 .suspend = snd_cmi8330_isa_suspend,
679 .resume = snd_cmi8330_isa_resume, 679 .resume = snd_cmi8330_isa_resume,
@@ -685,8 +685,8 @@ static struct isa_driver snd_cmi8330_driver = {
685 685
686 686
687#ifdef CONFIG_PNP 687#ifdef CONFIG_PNP
688static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *pcard, 688static int snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,
689 const struct pnp_card_device_id *pid) 689 const struct pnp_card_device_id *pid)
690{ 690{
691 static int dev; 691 static int dev;
692 struct snd_card *card; 692 struct snd_card *card;
@@ -717,7 +717,7 @@ static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,
717 return 0; 717 return 0;
718} 718}
719 719
720static void __devexit snd_cmi8330_pnp_remove(struct pnp_card_link * pcard) 720static void snd_cmi8330_pnp_remove(struct pnp_card_link *pcard)
721{ 721{
722 snd_card_free(pnp_get_card_drvdata(pcard)); 722 snd_card_free(pnp_get_card_drvdata(pcard));
723 pnp_set_card_drvdata(pcard, NULL); 723 pnp_set_card_drvdata(pcard, NULL);
@@ -740,7 +740,7 @@ static struct pnp_card_driver cmi8330_pnpc_driver = {
740 .name = "cmi8330", 740 .name = "cmi8330",
741 .id_table = snd_cmi8330_pnpids, 741 .id_table = snd_cmi8330_pnpids,
742 .probe = snd_cmi8330_pnp_detect, 742 .probe = snd_cmi8330_pnp_detect,
743 .remove = __devexit_p(snd_cmi8330_pnp_remove), 743 .remove = snd_cmi8330_pnp_remove,
744#ifdef CONFIG_PM 744#ifdef CONFIG_PM
745 .suspend = snd_cmi8330_pnp_suspend, 745 .suspend = snd_cmi8330_pnp_suspend,
746 .resume = snd_cmi8330_pnp_resume, 746 .resume = snd_cmi8330_pnp_resume,
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index 99dda45e82f..aa7a5d86e48 100644
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -68,7 +68,7 @@ MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");
68module_param_array(dma2, int, NULL, 0444); 68module_param_array(dma2, int, NULL, 0444);
69MODULE_PARM_DESC(dma2, "DMA2 # for " CRD_NAME " driver."); 69MODULE_PARM_DESC(dma2, "DMA2 # for " CRD_NAME " driver.");
70 70
71static int __devinit snd_cs4231_match(struct device *dev, unsigned int n) 71static int snd_cs4231_match(struct device *dev, unsigned int n)
72{ 72{
73 if (!enable[n]) 73 if (!enable[n])
74 return 0; 74 return 0;
@@ -88,7 +88,7 @@ static int __devinit snd_cs4231_match(struct device *dev, unsigned int n)
88 return 1; 88 return 1;
89} 89}
90 90
91static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n) 91static int snd_cs4231_probe(struct device *dev, unsigned int n)
92{ 92{
93 struct snd_card *card; 93 struct snd_card *card;
94 struct snd_wss *chip; 94 struct snd_wss *chip;
@@ -148,7 +148,7 @@ out: snd_card_free(card);
148 return error; 148 return error;
149} 149}
150 150
151static int __devexit snd_cs4231_remove(struct device *dev, unsigned int n) 151static int snd_cs4231_remove(struct device *dev, unsigned int n)
152{ 152{
153 snd_card_free(dev_get_drvdata(dev)); 153 snd_card_free(dev_get_drvdata(dev));
154 dev_set_drvdata(dev, NULL); 154 dev_set_drvdata(dev, NULL);
@@ -180,7 +180,7 @@ static int snd_cs4231_resume(struct device *dev, unsigned int n)
180static struct isa_driver snd_cs4231_driver = { 180static struct isa_driver snd_cs4231_driver = {
181 .match = snd_cs4231_match, 181 .match = snd_cs4231_match,
182 .probe = snd_cs4231_probe, 182 .probe = snd_cs4231_probe,
183 .remove = __devexit_p(snd_cs4231_remove), 183 .remove = snd_cs4231_remove,
184#ifdef CONFIG_PM 184#ifdef CONFIG_PM
185 .suspend = snd_cs4231_suspend, 185 .suspend = snd_cs4231_suspend,
186 .resume = snd_cs4231_resume, 186 .resume = snd_cs4231_resume,
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 740c51a1ed7..252e9fb37db 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -251,7 +251,7 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] = {
251MODULE_DEVICE_TABLE(pnp_card, snd_cs423x_pnpids); 251MODULE_DEVICE_TABLE(pnp_card, snd_cs423x_pnpids);
252 252
253/* WSS initialization */ 253/* WSS initialization */
254static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev) 254static int snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev)
255{ 255{
256 if (pnp_activate_dev(pdev) < 0) { 256 if (pnp_activate_dev(pdev) < 0) {
257 printk(KERN_ERR IDENT " WSS PnP configure failed for WSS (out of resources?)\n"); 257 printk(KERN_ERR IDENT " WSS PnP configure failed for WSS (out of resources?)\n");
@@ -272,7 +272,7 @@ static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev)
272} 272}
273 273
274/* CTRL initialization */ 274/* CTRL initialization */
275static int __devinit snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev) 275static int snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev)
276{ 276{
277 if (pnp_activate_dev(pdev) < 0) { 277 if (pnp_activate_dev(pdev) < 0) {
278 printk(KERN_ERR IDENT " CTRL PnP configure failed for WSS (out of resources?)\n"); 278 printk(KERN_ERR IDENT " CTRL PnP configure failed for WSS (out of resources?)\n");
@@ -284,7 +284,7 @@ static int __devinit snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev)
284} 284}
285 285
286/* MPU initialization */ 286/* MPU initialization */
287static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev) 287static int snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
288{ 288{
289 if (pnp_activate_dev(pdev) < 0) { 289 if (pnp_activate_dev(pdev) < 0) {
290 printk(KERN_ERR IDENT " MPU401 PnP configure failed for WSS (out of resources?)\n"); 290 printk(KERN_ERR IDENT " MPU401 PnP configure failed for WSS (out of resources?)\n");
@@ -303,9 +303,9 @@ static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
303 return 0; 303 return 0;
304} 304}
305 305
306static int __devinit snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard, 306static int snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard,
307 struct pnp_dev *pdev, 307 struct pnp_dev *pdev,
308 struct pnp_dev *cdev) 308 struct pnp_dev *cdev)
309{ 309{
310 acard->wss = pdev; 310 acard->wss = pdev;
311 if (snd_cs423x_pnp_init_wss(dev, acard->wss) < 0) 311 if (snd_cs423x_pnp_init_wss(dev, acard->wss) < 0)
@@ -317,9 +317,9 @@ static int __devinit snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard,
317 return 0; 317 return 0;
318} 318}
319 319
320static int __devinit snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard, 320static int snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard,
321 struct pnp_card_link *card, 321 struct pnp_card_link *card,
322 const struct pnp_card_device_id *id) 322 const struct pnp_card_device_id *id)
323{ 323{
324 acard->wss = pnp_request_card_device(card, id->devs[0].id, NULL); 324 acard->wss = pnp_request_card_device(card, id->devs[0].id, NULL);
325 if (acard->wss == NULL) 325 if (acard->wss == NULL)
@@ -378,7 +378,7 @@ static int snd_cs423x_card_new(int dev, struct snd_card **cardp)
378 return 0; 378 return 0;
379} 379}
380 380
381static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) 381static int snd_cs423x_probe(struct snd_card *card, int dev)
382{ 382{
383 struct snd_card_cs4236 *acard; 383 struct snd_card_cs4236 *acard;
384 struct snd_pcm *pcm; 384 struct snd_pcm *pcm;
@@ -456,8 +456,8 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
456 return snd_card_register(card); 456 return snd_card_register(card);
457} 457}
458 458
459static int __devinit snd_cs423x_isa_match(struct device *pdev, 459static int snd_cs423x_isa_match(struct device *pdev,
460 unsigned int dev) 460 unsigned int dev)
461{ 461{
462 if (!enable[dev] || is_isapnp_selected(dev)) 462 if (!enable[dev] || is_isapnp_selected(dev))
463 return 0; 463 return 0;
@@ -481,8 +481,8 @@ static int __devinit snd_cs423x_isa_match(struct device *pdev,
481 return 1; 481 return 1;
482} 482}
483 483
484static int __devinit snd_cs423x_isa_probe(struct device *pdev, 484static int snd_cs423x_isa_probe(struct device *pdev,
485 unsigned int dev) 485 unsigned int dev)
486{ 486{
487 struct snd_card *card; 487 struct snd_card *card;
488 int err; 488 int err;
@@ -500,8 +500,8 @@ static int __devinit snd_cs423x_isa_probe(struct device *pdev,
500 return 0; 500 return 0;
501} 501}
502 502
503static int __devexit snd_cs423x_isa_remove(struct device *pdev, 503static int snd_cs423x_isa_remove(struct device *pdev,
504 unsigned int dev) 504 unsigned int dev)
505{ 505{
506 snd_card_free(dev_get_drvdata(pdev)); 506 snd_card_free(dev_get_drvdata(pdev));
507 dev_set_drvdata(pdev, NULL); 507 dev_set_drvdata(pdev, NULL);
@@ -540,7 +540,7 @@ static int snd_cs423x_isa_resume(struct device *dev, unsigned int n)
540static struct isa_driver cs423x_isa_driver = { 540static struct isa_driver cs423x_isa_driver = {
541 .match = snd_cs423x_isa_match, 541 .match = snd_cs423x_isa_match,
542 .probe = snd_cs423x_isa_probe, 542 .probe = snd_cs423x_isa_probe,
543 .remove = __devexit_p(snd_cs423x_isa_remove), 543 .remove = snd_cs423x_isa_remove,
544#ifdef CONFIG_PM 544#ifdef CONFIG_PM
545 .suspend = snd_cs423x_isa_suspend, 545 .suspend = snd_cs423x_isa_suspend,
546 .resume = snd_cs423x_isa_resume, 546 .resume = snd_cs423x_isa_resume,
@@ -552,8 +552,8 @@ static struct isa_driver cs423x_isa_driver = {
552 552
553 553
554#ifdef CONFIG_PNP 554#ifdef CONFIG_PNP
555static int __devinit snd_cs423x_pnpbios_detect(struct pnp_dev *pdev, 555static int snd_cs423x_pnpbios_detect(struct pnp_dev *pdev,
556 const struct pnp_device_id *id) 556 const struct pnp_device_id *id)
557{ 557{
558 static int dev; 558 static int dev;
559 int err; 559 int err;
@@ -597,7 +597,7 @@ static int __devinit snd_cs423x_pnpbios_detect(struct pnp_dev *pdev,
597 return 0; 597 return 0;
598} 598}
599 599
600static void __devexit snd_cs423x_pnp_remove(struct pnp_dev *pdev) 600static void snd_cs423x_pnp_remove(struct pnp_dev *pdev)
601{ 601{
602 snd_card_free(pnp_get_drvdata(pdev)); 602 snd_card_free(pnp_get_drvdata(pdev));
603 pnp_set_drvdata(pdev, NULL); 603 pnp_set_drvdata(pdev, NULL);
@@ -619,15 +619,15 @@ static struct pnp_driver cs423x_pnp_driver = {
619 .name = "cs423x-pnpbios", 619 .name = "cs423x-pnpbios",
620 .id_table = snd_cs423x_pnpbiosids, 620 .id_table = snd_cs423x_pnpbiosids,
621 .probe = snd_cs423x_pnpbios_detect, 621 .probe = snd_cs423x_pnpbios_detect,
622 .remove = __devexit_p(snd_cs423x_pnp_remove), 622 .remove = snd_cs423x_pnp_remove,
623#ifdef CONFIG_PM 623#ifdef CONFIG_PM
624 .suspend = snd_cs423x_pnp_suspend, 624 .suspend = snd_cs423x_pnp_suspend,
625 .resume = snd_cs423x_pnp_resume, 625 .resume = snd_cs423x_pnp_resume,
626#endif 626#endif
627}; 627};
628 628
629static int __devinit snd_cs423x_pnpc_detect(struct pnp_card_link *pcard, 629static int snd_cs423x_pnpc_detect(struct pnp_card_link *pcard,
630 const struct pnp_card_device_id *pid) 630 const struct pnp_card_device_id *pid)
631{ 631{
632 static int dev; 632 static int dev;
633 struct snd_card *card; 633 struct snd_card *card;
@@ -659,7 +659,7 @@ static int __devinit snd_cs423x_pnpc_detect(struct pnp_card_link *pcard,
659 return 0; 659 return 0;
660} 660}
661 661
662static void __devexit snd_cs423x_pnpc_remove(struct pnp_card_link * pcard) 662static void snd_cs423x_pnpc_remove(struct pnp_card_link *pcard)
663{ 663{
664 snd_card_free(pnp_get_card_drvdata(pcard)); 664 snd_card_free(pnp_get_card_drvdata(pcard));
665 pnp_set_card_drvdata(pcard, NULL); 665 pnp_set_card_drvdata(pcard, NULL);
@@ -682,7 +682,7 @@ static struct pnp_card_driver cs423x_pnpc_driver = {
682 .name = CS423X_ISAPNP_DRIVER, 682 .name = CS423X_ISAPNP_DRIVER,
683 .id_table = snd_cs423x_pnpids, 683 .id_table = snd_cs423x_pnpids,
684 .probe = snd_cs423x_pnpc_detect, 684 .probe = snd_cs423x_pnpc_detect,
685 .remove = __devexit_p(snd_cs423x_pnpc_remove), 685 .remove = snd_cs423x_pnpc_remove,
686#ifdef CONFIG_PM 686#ifdef CONFIG_PM
687 .suspend = snd_cs423x_pnpc_suspend, 687 .suspend = snd_cs423x_pnpc_suspend,
688 .resume = snd_cs423x_pnpc_resume, 688 .resume = snd_cs423x_pnpc_resume,
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index b036e60f62d..102874a703d 100644
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -90,13 +90,13 @@ MODULE_PARM_DESC(dma8, "8-bit DMA # for " CRD_NAME " driver.");
90#define is_isapnp_selected(dev) 0 90#define is_isapnp_selected(dev) 0
91#endif 91#endif
92 92
93static int __devinit snd_es1688_match(struct device *dev, unsigned int n) 93static int snd_es1688_match(struct device *dev, unsigned int n)
94{ 94{
95 return enable[n] && !is_isapnp_selected(n); 95 return enable[n] && !is_isapnp_selected(n);
96} 96}
97 97
98static int __devinit snd_es1688_legacy_create(struct snd_card *card, 98static int snd_es1688_legacy_create(struct snd_card *card,
99 struct device *dev, unsigned int n) 99 struct device *dev, unsigned int n)
100{ 100{
101 struct snd_es1688 *chip = card->private_data; 101 struct snd_es1688 *chip = card->private_data;
102 static long possible_ports[] = {0x220, 0x240, 0x260}; 102 static long possible_ports[] = {0x220, 0x240, 0x260};
@@ -134,7 +134,7 @@ static int __devinit snd_es1688_legacy_create(struct snd_card *card,
134 return error; 134 return error;
135} 135}
136 136
137static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n) 137static int snd_es1688_probe(struct snd_card *card, unsigned int n)
138{ 138{
139 struct snd_es1688 *chip = card->private_data; 139 struct snd_es1688 *chip = card->private_data;
140 struct snd_opl3 *opl3; 140 struct snd_opl3 *opl3;
@@ -182,7 +182,7 @@ static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n)
182 return snd_card_register(card); 182 return snd_card_register(card);
183} 183}
184 184
185static int __devinit snd_es1688_isa_probe(struct device *dev, unsigned int n) 185static int snd_es1688_isa_probe(struct device *dev, unsigned int n)
186{ 186{
187 struct snd_card *card; 187 struct snd_card *card;
188 int error; 188 int error;
@@ -210,7 +210,7 @@ out:
210 return error; 210 return error;
211} 211}
212 212
213static int __devexit snd_es1688_isa_remove(struct device *dev, unsigned int n) 213static int snd_es1688_isa_remove(struct device *dev, unsigned int n)
214{ 214{
215 snd_card_free(dev_get_drvdata(dev)); 215 snd_card_free(dev_get_drvdata(dev));
216 dev_set_drvdata(dev, NULL); 216 dev_set_drvdata(dev, NULL);
@@ -220,7 +220,7 @@ static int __devexit snd_es1688_isa_remove(struct device *dev, unsigned int n)
220static struct isa_driver snd_es1688_driver = { 220static struct isa_driver snd_es1688_driver = {
221 .match = snd_es1688_match, 221 .match = snd_es1688_match,
222 .probe = snd_es1688_isa_probe, 222 .probe = snd_es1688_isa_probe,
223 .remove = __devexit_p(snd_es1688_isa_remove), 223 .remove = snd_es1688_isa_remove,
224#if 0 /* FIXME */ 224#if 0 /* FIXME */
225 .suspend = snd_es1688_suspend, 225 .suspend = snd_es1688_suspend,
226 .resume = snd_es1688_resume, 226 .resume = snd_es1688_resume,
@@ -233,9 +233,9 @@ static struct isa_driver snd_es1688_driver = {
233static int snd_es968_pnp_is_probed; 233static int snd_es968_pnp_is_probed;
234 234
235#ifdef CONFIG_PNP 235#ifdef CONFIG_PNP
236static int __devinit snd_card_es968_pnp(struct snd_card *card, unsigned int n, 236static int snd_card_es968_pnp(struct snd_card *card, unsigned int n,
237 struct pnp_card_link *pcard, 237 struct pnp_card_link *pcard,
238 const struct pnp_card_device_id *pid) 238 const struct pnp_card_device_id *pid)
239{ 239{
240 struct snd_es1688 *chip = card->private_data; 240 struct snd_es1688 *chip = card->private_data;
241 struct pnp_dev *pdev; 241 struct pnp_dev *pdev;
@@ -258,8 +258,8 @@ static int __devinit snd_card_es968_pnp(struct snd_card *card, unsigned int n,
258 mpu_irq[n], dma8[n], ES1688_HW_AUTO); 258 mpu_irq[n], dma8[n], ES1688_HW_AUTO);
259} 259}
260 260
261static int __devinit snd_es968_pnp_detect(struct pnp_card_link *pcard, 261static int snd_es968_pnp_detect(struct pnp_card_link *pcard,
262 const struct pnp_card_device_id *pid) 262 const struct pnp_card_device_id *pid)
263{ 263{
264 struct snd_card *card; 264 struct snd_card *card;
265 static unsigned int dev; 265 static unsigned int dev;
@@ -295,7 +295,7 @@ static int __devinit snd_es968_pnp_detect(struct pnp_card_link *pcard,
295 return 0; 295 return 0;
296} 296}
297 297
298static void __devexit snd_es968_pnp_remove(struct pnp_card_link * pcard) 298static void snd_es968_pnp_remove(struct pnp_card_link *pcard)
299{ 299{
300 snd_card_free(pnp_get_card_drvdata(pcard)); 300 snd_card_free(pnp_get_card_drvdata(pcard));
301 pnp_set_card_drvdata(pcard, NULL); 301 pnp_set_card_drvdata(pcard, NULL);
@@ -338,7 +338,7 @@ static struct pnp_card_driver es968_pnpc_driver = {
338 .name = DEV_NAME " PnP", 338 .name = DEV_NAME " PnP",
339 .id_table = snd_es968_pnpids, 339 .id_table = snd_es968_pnpids,
340 .probe = snd_es968_pnp_detect, 340 .probe = snd_es968_pnp_detect,
341 .remove = __devexit_p(snd_es968_pnp_remove), 341 .remove = snd_es968_pnp_remove,
342#ifdef CONFIG_PM 342#ifdef CONFIG_PM
343 .suspend = snd_es968_pnp_suspend, 343 .suspend = snd_es968_pnp_suspend,
344 .resume = snd_es968_pnp_resume, 344 .resume = snd_es968_pnp_resume,
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index c20baafd9b7..24380efe31a 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -348,7 +348,7 @@ static inline int snd_es18xx_mixer_writable(struct snd_es18xx *chip, unsigned ch
348} 348}
349 349
350 350
351static int __devinit snd_es18xx_reset(struct snd_es18xx *chip) 351static int snd_es18xx_reset(struct snd_es18xx *chip)
352{ 352{
353 int i; 353 int i;
354 outb(0x03, chip->port + 0x06); 354 outb(0x03, chip->port + 0x06);
@@ -1363,7 +1363,7 @@ static struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = {
1363ES18XX_SINGLE("Hardware Master Volume Split", 0, 0x64, 7, 1, 0), 1363ES18XX_SINGLE("Hardware Master Volume Split", 0, 0x64, 7, 1, 0),
1364}; 1364};
1365 1365
1366static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg) 1366static int snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg)
1367{ 1367{
1368 int data; 1368 int data;
1369 1369
@@ -1372,8 +1372,8 @@ static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned ch
1372 return data; 1372 return data;
1373} 1373}
1374 1374
1375static void __devinit snd_es18xx_config_write(struct snd_es18xx *chip, 1375static void snd_es18xx_config_write(struct snd_es18xx *chip,
1376 unsigned char reg, unsigned char data) 1376 unsigned char reg, unsigned char data)
1377{ 1377{
1378 /* No need for spinlocks, this function is used only in 1378 /* No need for spinlocks, this function is used only in
1379 otherwise protected init code */ 1379 otherwise protected init code */
@@ -1384,9 +1384,9 @@ static void __devinit snd_es18xx_config_write(struct snd_es18xx *chip,
1384#endif 1384#endif
1385} 1385}
1386 1386
1387static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip, 1387static int snd_es18xx_initialize(struct snd_es18xx *chip,
1388 unsigned long mpu_port, 1388 unsigned long mpu_port,
1389 unsigned long fm_port) 1389 unsigned long fm_port)
1390{ 1390{
1391 int mask = 0; 1391 int mask = 0;
1392 1392
@@ -1549,7 +1549,7 @@ static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip,
1549 return 0; 1549 return 0;
1550} 1550}
1551 1551
1552static int __devinit snd_es18xx_identify(struct snd_es18xx *chip) 1552static int snd_es18xx_identify(struct snd_es18xx *chip)
1553{ 1553{
1554 int hi,lo; 1554 int hi,lo;
1555 1555
@@ -1618,9 +1618,9 @@ static int __devinit snd_es18xx_identify(struct snd_es18xx *chip)
1618 return 0; 1618 return 0;
1619} 1619}
1620 1620
1621static int __devinit snd_es18xx_probe(struct snd_es18xx *chip, 1621static int snd_es18xx_probe(struct snd_es18xx *chip,
1622 unsigned long mpu_port, 1622 unsigned long mpu_port,
1623 unsigned long fm_port) 1623 unsigned long fm_port)
1624{ 1624{
1625 if (snd_es18xx_identify(chip) < 0) { 1625 if (snd_es18xx_identify(chip) < 0) {
1626 snd_printk(KERN_ERR PFX "[0x%lx] ESS chip not found\n", chip->port); 1626 snd_printk(KERN_ERR PFX "[0x%lx] ESS chip not found\n", chip->port);
@@ -1680,8 +1680,8 @@ static struct snd_pcm_ops snd_es18xx_capture_ops = {
1680 .pointer = snd_es18xx_capture_pointer, 1680 .pointer = snd_es18xx_capture_pointer,
1681}; 1681};
1682 1682
1683static int __devinit snd_es18xx_pcm(struct snd_card *card, int device, 1683static int snd_es18xx_pcm(struct snd_card *card, int device,
1684 struct snd_pcm **rpcm) 1684 struct snd_pcm **rpcm)
1685{ 1685{
1686 struct snd_es18xx *chip = card->private_data; 1686 struct snd_es18xx *chip = card->private_data;
1687 struct snd_pcm *pcm; 1687 struct snd_pcm *pcm;
@@ -1777,11 +1777,11 @@ static int snd_es18xx_dev_free(struct snd_device *device)
1777 return snd_es18xx_free(device->card); 1777 return snd_es18xx_free(device->card);
1778} 1778}
1779 1779
1780static int __devinit snd_es18xx_new_device(struct snd_card *card, 1780static int snd_es18xx_new_device(struct snd_card *card,
1781 unsigned long port, 1781 unsigned long port,
1782 unsigned long mpu_port, 1782 unsigned long mpu_port,
1783 unsigned long fm_port, 1783 unsigned long fm_port,
1784 int irq, int dma1, int dma2) 1784 int irq, int dma1, int dma2)
1785{ 1785{
1786 struct snd_es18xx *chip = card->private_data; 1786 struct snd_es18xx *chip = card->private_data;
1787 static struct snd_device_ops ops = { 1787 static struct snd_device_ops ops = {
@@ -1839,7 +1839,7 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card,
1839 return 0; 1839 return 0;
1840} 1840}
1841 1841
1842static int __devinit snd_es18xx_mixer(struct snd_card *card) 1842static int snd_es18xx_mixer(struct snd_card *card)
1843{ 1843{
1844 struct snd_es18xx *chip = card->private_data; 1844 struct snd_es18xx *chip = card->private_data;
1845 int err; 1845 int err;
@@ -2016,7 +2016,7 @@ static struct pnp_device_id snd_audiodrive_pnpbiosids[] = {
2016MODULE_DEVICE_TABLE(pnp, snd_audiodrive_pnpbiosids); 2016MODULE_DEVICE_TABLE(pnp, snd_audiodrive_pnpbiosids);
2017 2017
2018/* PnP main device initialization */ 2018/* PnP main device initialization */
2019static int __devinit snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev) 2019static int snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev)
2020{ 2020{
2021 if (pnp_activate_dev(pdev) < 0) { 2021 if (pnp_activate_dev(pdev) < 0) {
2022 snd_printk(KERN_ERR PFX "PnP configure failure (out of resources?)\n"); 2022 snd_printk(KERN_ERR PFX "PnP configure failure (out of resources?)\n");
@@ -2043,8 +2043,8 @@ static int __devinit snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev)
2043 return 0; 2043 return 0;
2044} 2044}
2045 2045
2046static int __devinit snd_audiodrive_pnp(int dev, struct snd_es18xx *chip, 2046static int snd_audiodrive_pnp(int dev, struct snd_es18xx *chip,
2047 struct pnp_dev *pdev) 2047 struct pnp_dev *pdev)
2048{ 2048{
2049 chip->dev = pdev; 2049 chip->dev = pdev;
2050 if (snd_audiodrive_pnp_init_main(dev, chip->dev) < 0) 2050 if (snd_audiodrive_pnp_init_main(dev, chip->dev) < 0)
@@ -2073,9 +2073,9 @@ static struct pnp_card_device_id snd_audiodrive_pnpids[] = {
2073 2073
2074MODULE_DEVICE_TABLE(pnp_card, snd_audiodrive_pnpids); 2074MODULE_DEVICE_TABLE(pnp_card, snd_audiodrive_pnpids);
2075 2075
2076static int __devinit snd_audiodrive_pnpc(int dev, struct snd_es18xx *chip, 2076static int snd_audiodrive_pnpc(int dev, struct snd_es18xx *chip,
2077 struct pnp_card_link *card, 2077 struct pnp_card_link *card,
2078 const struct pnp_card_device_id *id) 2078 const struct pnp_card_device_id *id)
2079{ 2079{
2080 chip->dev = pnp_request_card_device(card, id->devs[0].id, NULL); 2080 chip->dev = pnp_request_card_device(card, id->devs[0].id, NULL);
2081 if (chip->dev == NULL) 2081 if (chip->dev == NULL)
@@ -2111,7 +2111,7 @@ static int snd_es18xx_card_new(int dev, struct snd_card **cardp)
2111 sizeof(struct snd_es18xx), cardp); 2111 sizeof(struct snd_es18xx), cardp);
2112} 2112}
2113 2113
2114static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev) 2114static int snd_audiodrive_probe(struct snd_card *card, int dev)
2115{ 2115{
2116 struct snd_es18xx *chip = card->private_data; 2116 struct snd_es18xx *chip = card->private_data;
2117 struct snd_opl3 *opl3; 2117 struct snd_opl3 *opl3;
@@ -2169,12 +2169,12 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)
2169 return snd_card_register(card); 2169 return snd_card_register(card);
2170} 2170}
2171 2171
2172static int __devinit snd_es18xx_isa_match(struct device *pdev, unsigned int dev) 2172static int snd_es18xx_isa_match(struct device *pdev, unsigned int dev)
2173{ 2173{
2174 return enable[dev] && !is_isapnp_selected(dev); 2174 return enable[dev] && !is_isapnp_selected(dev);
2175} 2175}
2176 2176
2177static int __devinit snd_es18xx_isa_probe1(int dev, struct device *devptr) 2177static int snd_es18xx_isa_probe1(int dev, struct device *devptr)
2178{ 2178{
2179 struct snd_card *card; 2179 struct snd_card *card;
2180 int err; 2180 int err;
@@ -2191,7 +2191,7 @@ static int __devinit snd_es18xx_isa_probe1(int dev, struct device *devptr)
2191 return 0; 2191 return 0;
2192} 2192}
2193 2193
2194static int __devinit snd_es18xx_isa_probe(struct device *pdev, unsigned int dev) 2194static int snd_es18xx_isa_probe(struct device *pdev, unsigned int dev)
2195{ 2195{
2196 int err; 2196 int err;
2197 static int possible_irqs[] = {5, 9, 10, 7, 11, 12, -1}; 2197 static int possible_irqs[] = {5, 9, 10, 7, 11, 12, -1};
@@ -2231,8 +2231,8 @@ static int __devinit snd_es18xx_isa_probe(struct device *pdev, unsigned int dev)
2231 } 2231 }
2232} 2232}
2233 2233
2234static int __devexit snd_es18xx_isa_remove(struct device *devptr, 2234static int snd_es18xx_isa_remove(struct device *devptr,
2235 unsigned int dev) 2235 unsigned int dev)
2236{ 2236{
2237 snd_card_free(dev_get_drvdata(devptr)); 2237 snd_card_free(dev_get_drvdata(devptr));
2238 dev_set_drvdata(devptr, NULL); 2238 dev_set_drvdata(devptr, NULL);
@@ -2257,7 +2257,7 @@ static int snd_es18xx_isa_resume(struct device *dev, unsigned int n)
2257static struct isa_driver snd_es18xx_isa_driver = { 2257static struct isa_driver snd_es18xx_isa_driver = {
2258 .match = snd_es18xx_isa_match, 2258 .match = snd_es18xx_isa_match,
2259 .probe = snd_es18xx_isa_probe, 2259 .probe = snd_es18xx_isa_probe,
2260 .remove = __devexit_p(snd_es18xx_isa_remove), 2260 .remove = snd_es18xx_isa_remove,
2261#ifdef CONFIG_PM 2261#ifdef CONFIG_PM
2262 .suspend = snd_es18xx_isa_suspend, 2262 .suspend = snd_es18xx_isa_suspend,
2263 .resume = snd_es18xx_isa_resume, 2263 .resume = snd_es18xx_isa_resume,
@@ -2269,8 +2269,8 @@ static struct isa_driver snd_es18xx_isa_driver = {
2269 2269
2270 2270
2271#ifdef CONFIG_PNP 2271#ifdef CONFIG_PNP
2272static int __devinit snd_audiodrive_pnp_detect(struct pnp_dev *pdev, 2272static int snd_audiodrive_pnp_detect(struct pnp_dev *pdev,
2273 const struct pnp_device_id *id) 2273 const struct pnp_device_id *id)
2274{ 2274{
2275 static int dev; 2275 static int dev;
2276 int err; 2276 int err;
@@ -2302,7 +2302,7 @@ static int __devinit snd_audiodrive_pnp_detect(struct pnp_dev *pdev,
2302 return 0; 2302 return 0;
2303} 2303}
2304 2304
2305static void __devexit snd_audiodrive_pnp_remove(struct pnp_dev * pdev) 2305static void snd_audiodrive_pnp_remove(struct pnp_dev *pdev)
2306{ 2306{
2307 snd_card_free(pnp_get_drvdata(pdev)); 2307 snd_card_free(pnp_get_drvdata(pdev));
2308 pnp_set_drvdata(pdev, NULL); 2308 pnp_set_drvdata(pdev, NULL);
@@ -2323,15 +2323,15 @@ static struct pnp_driver es18xx_pnp_driver = {
2323 .name = "es18xx-pnpbios", 2323 .name = "es18xx-pnpbios",
2324 .id_table = snd_audiodrive_pnpbiosids, 2324 .id_table = snd_audiodrive_pnpbiosids,
2325 .probe = snd_audiodrive_pnp_detect, 2325 .probe = snd_audiodrive_pnp_detect,
2326 .remove = __devexit_p(snd_audiodrive_pnp_remove), 2326 .remove = snd_audiodrive_pnp_remove,
2327#ifdef CONFIG_PM 2327#ifdef CONFIG_PM
2328 .suspend = snd_audiodrive_pnp_suspend, 2328 .suspend = snd_audiodrive_pnp_suspend,
2329 .resume = snd_audiodrive_pnp_resume, 2329 .resume = snd_audiodrive_pnp_resume,
2330#endif 2330#endif
2331}; 2331};
2332 2332
2333static int __devinit snd_audiodrive_pnpc_detect(struct pnp_card_link *pcard, 2333static int snd_audiodrive_pnpc_detect(struct pnp_card_link *pcard,
2334 const struct pnp_card_device_id *pid) 2334 const struct pnp_card_device_id *pid)
2335{ 2335{
2336 static int dev; 2336 static int dev;
2337 struct snd_card *card; 2337 struct snd_card *card;
@@ -2363,7 +2363,7 @@ static int __devinit snd_audiodrive_pnpc_detect(struct pnp_card_link *pcard,
2363 return 0; 2363 return 0;
2364} 2364}
2365 2365
2366static void __devexit snd_audiodrive_pnpc_remove(struct pnp_card_link * pcard) 2366static void snd_audiodrive_pnpc_remove(struct pnp_card_link *pcard)
2367{ 2367{
2368 snd_card_free(pnp_get_card_drvdata(pcard)); 2368 snd_card_free(pnp_get_card_drvdata(pcard));
2369 pnp_set_card_drvdata(pcard, NULL); 2369 pnp_set_card_drvdata(pcard, NULL);
@@ -2387,7 +2387,7 @@ static struct pnp_card_driver es18xx_pnpc_driver = {
2387 .name = "es18xx", 2387 .name = "es18xx",
2388 .id_table = snd_audiodrive_pnpids, 2388 .id_table = snd_audiodrive_pnpids,
2389 .probe = snd_audiodrive_pnpc_detect, 2389 .probe = snd_audiodrive_pnpc_detect,
2390 .remove = __devexit_p(snd_audiodrive_pnpc_remove), 2390 .remove = snd_audiodrive_pnpc_remove,
2391#ifdef CONFIG_PM 2391#ifdef CONFIG_PM
2392 .suspend = snd_audiodrive_pnpc_suspend, 2392 .suspend = snd_audiodrive_pnpc_suspend,
2393 .resume = snd_audiodrive_pnpc_resume, 2393 .resume = snd_audiodrive_pnpc_resume,
diff --git a/sound/isa/galaxy/galaxy.c b/sound/isa/galaxy/galaxy.c
index 55e20782858..672184e3221 100644
--- a/sound/isa/galaxy/galaxy.c
+++ b/sound/isa/galaxy/galaxy.c
@@ -84,7 +84,7 @@ MODULE_PARM_DESC(dma2, "Capture DMA # for " CRD_NAME " driver.");
84 84
85#define DSP_COMMAND_GET_VERSION 0xe1 85#define DSP_COMMAND_GET_VERSION 0xe1
86 86
87static int __devinit dsp_get_byte(void __iomem *port, u8 *val) 87static int dsp_get_byte(void __iomem *port, u8 *val)
88{ 88{
89 int loops = 1000; 89 int loops = 1000;
90 90
@@ -97,7 +97,7 @@ static int __devinit dsp_get_byte(void __iomem *port, u8 *val)
97 return 0; 97 return 0;
98} 98}
99 99
100static int __devinit dsp_reset(void __iomem *port) 100static int dsp_reset(void __iomem *port)
101{ 101{
102 u8 val; 102 u8 val;
103 103
@@ -111,7 +111,7 @@ static int __devinit dsp_reset(void __iomem *port)
111 return 0; 111 return 0;
112} 112}
113 113
114static int __devinit dsp_command(void __iomem *port, u8 cmd) 114static int dsp_command(void __iomem *port, u8 cmd)
115{ 115{
116 int loops = 1000; 116 int loops = 1000;
117 117
@@ -124,7 +124,7 @@ static int __devinit dsp_command(void __iomem *port, u8 cmd)
124 return 0; 124 return 0;
125} 125}
126 126
127static int __devinit dsp_get_version(void __iomem *port, u8 *major, u8 *minor) 127static int dsp_get_version(void __iomem *port, u8 *major, u8 *minor)
128{ 128{
129 int err; 129 int err;
130 130
@@ -161,7 +161,7 @@ static int __devinit dsp_get_version(void __iomem *port, u8 *major, u8 *minor)
161 161
162#define WSS_SIGNATURE 4 162#define WSS_SIGNATURE 4
163 163
164static int __devinit wss_detect(void __iomem *wss_port) 164static int wss_detect(void __iomem *wss_port)
165{ 165{
166 if ((ioread8(wss_port + WSS_PORT_SIGNATURE) & 0x3f) != WSS_SIGNATURE) 166 if ((ioread8(wss_port + WSS_PORT_SIGNATURE) & 0x3f) != WSS_SIGNATURE)
167 return -ENODEV; 167 return -ENODEV;
@@ -204,7 +204,7 @@ struct snd_galaxy {
204static u32 config[SNDRV_CARDS]; 204static u32 config[SNDRV_CARDS];
205static u8 wss_config[SNDRV_CARDS]; 205static u8 wss_config[SNDRV_CARDS];
206 206
207static int __devinit snd_galaxy_match(struct device *dev, unsigned int n) 207static int snd_galaxy_match(struct device *dev, unsigned int n)
208{ 208{
209 if (!enable[n]) 209 if (!enable[n])
210 return 0; 210 return 0;
@@ -379,7 +379,7 @@ fm:
379 return 1; 379 return 1;
380} 380}
381 381
382static int __devinit galaxy_init(struct snd_galaxy *galaxy, u8 *type) 382static int galaxy_init(struct snd_galaxy *galaxy, u8 *type)
383{ 383{
384 u8 major; 384 u8 major;
385 u8 minor; 385 u8 minor;
@@ -411,7 +411,7 @@ static int __devinit galaxy_init(struct snd_galaxy *galaxy, u8 *type)
411 return 0; 411 return 0;
412} 412}
413 413
414static int __devinit galaxy_set_mode(struct snd_galaxy *galaxy, u8 mode) 414static int galaxy_set_mode(struct snd_galaxy *galaxy, u8 mode)
415{ 415{
416 int err; 416 int err;
417 417
@@ -449,7 +449,7 @@ static void galaxy_set_config(struct snd_galaxy *galaxy, u32 config)
449 msleep(10); 449 msleep(10);
450} 450}
451 451
452static void __devinit galaxy_config(struct snd_galaxy *galaxy, u32 config) 452static void galaxy_config(struct snd_galaxy *galaxy, u32 config)
453{ 453{
454 int i; 454 int i;
455 455
@@ -461,7 +461,7 @@ static void __devinit galaxy_config(struct snd_galaxy *galaxy, u32 config)
461 galaxy_set_config(galaxy, config); 461 galaxy_set_config(galaxy, config);
462} 462}
463 463
464static int __devinit galaxy_wss_config(struct snd_galaxy *galaxy, u8 wss_config) 464static int galaxy_wss_config(struct snd_galaxy *galaxy, u8 wss_config)
465{ 465{
466 int err; 466 int err;
467 467
@@ -498,7 +498,7 @@ static void snd_galaxy_free(struct snd_card *card)
498 } 498 }
499} 499}
500 500
501static int __devinit snd_galaxy_probe(struct device *dev, unsigned int n) 501static int snd_galaxy_probe(struct device *dev, unsigned int n)
502{ 502{
503 struct snd_galaxy *galaxy; 503 struct snd_galaxy *galaxy;
504 struct snd_wss *chip; 504 struct snd_wss *chip;
@@ -620,7 +620,7 @@ error:
620 return err; 620 return err;
621} 621}
622 622
623static int __devexit snd_galaxy_remove(struct device *dev, unsigned int n) 623static int snd_galaxy_remove(struct device *dev, unsigned int n)
624{ 624{
625 snd_card_free(dev_get_drvdata(dev)); 625 snd_card_free(dev_get_drvdata(dev));
626 dev_set_drvdata(dev, NULL); 626 dev_set_drvdata(dev, NULL);
@@ -630,7 +630,7 @@ static int __devexit snd_galaxy_remove(struct device *dev, unsigned int n)
630static struct isa_driver snd_galaxy_driver = { 630static struct isa_driver snd_galaxy_driver = {
631 .match = snd_galaxy_match, 631 .match = snd_galaxy_match,
632 .probe = snd_galaxy_probe, 632 .probe = snd_galaxy_probe,
633 .remove = __devexit_p(snd_galaxy_remove), 633 .remove = snd_galaxy_remove,
634 634
635 .driver = { 635 .driver = {
636 .name = DEV_NAME 636 .name = DEV_NAME
diff --git a/sound/isa/gus/gusclassic.c b/sound/isa/gus/gusclassic.c
index bf633367161..16bca4e96c0 100644
--- a/sound/isa/gus/gusclassic.c
+++ b/sound/isa/gus/gusclassic.c
@@ -73,13 +73,14 @@ MODULE_PARM_DESC(channels, "GF1 channels for " CRD_NAME " driver.");
73module_param_array(pcm_channels, int, NULL, 0444); 73module_param_array(pcm_channels, int, NULL, 0444);
74MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for " CRD_NAME " driver."); 74MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for " CRD_NAME " driver.");
75 75
76static int __devinit snd_gusclassic_match(struct device *dev, unsigned int n) 76static int snd_gusclassic_match(struct device *dev, unsigned int n)
77{ 77{
78 return enable[n]; 78 return enable[n];
79} 79}
80 80
81static int __devinit snd_gusclassic_create(struct snd_card *card, 81static int snd_gusclassic_create(struct snd_card *card,
82 struct device *dev, unsigned int n, struct snd_gus_card **rgus) 82 struct device *dev, unsigned int n,
83 struct snd_gus_card **rgus)
83{ 84{
84 static long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260}; 85 static long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260};
85 static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1}; 86 static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};
@@ -123,7 +124,7 @@ static int __devinit snd_gusclassic_create(struct snd_card *card,
123 return error; 124 return error;
124} 125}
125 126
126static int __devinit snd_gusclassic_detect(struct snd_gus_card *gus) 127static int snd_gusclassic_detect(struct snd_gus_card *gus)
127{ 128{
128 unsigned char d; 129 unsigned char d;
129 130
@@ -142,7 +143,7 @@ static int __devinit snd_gusclassic_detect(struct snd_gus_card *gus)
142 return 0; 143 return 0;
143} 144}
144 145
145static int __devinit snd_gusclassic_probe(struct device *dev, unsigned int n) 146static int snd_gusclassic_probe(struct device *dev, unsigned int n)
146{ 147{
147 struct snd_card *card; 148 struct snd_card *card;
148 struct snd_gus_card *gus; 149 struct snd_gus_card *gus;
@@ -211,7 +212,7 @@ out: snd_card_free(card);
211 return error; 212 return error;
212} 213}
213 214
214static int __devexit snd_gusclassic_remove(struct device *dev, unsigned int n) 215static int snd_gusclassic_remove(struct device *dev, unsigned int n)
215{ 216{
216 snd_card_free(dev_get_drvdata(dev)); 217 snd_card_free(dev_get_drvdata(dev));
217 dev_set_drvdata(dev, NULL); 218 dev_set_drvdata(dev, NULL);
@@ -221,7 +222,7 @@ static int __devexit snd_gusclassic_remove(struct device *dev, unsigned int n)
221static struct isa_driver snd_gusclassic_driver = { 222static struct isa_driver snd_gusclassic_driver = {
222 .match = snd_gusclassic_match, 223 .match = snd_gusclassic_match,
223 .probe = snd_gusclassic_probe, 224 .probe = snd_gusclassic_probe,
224 .remove = __devexit_p(snd_gusclassic_remove), 225 .remove = snd_gusclassic_remove,
225#if 0 /* FIXME */ 226#if 0 /* FIXME */
226 .suspend = snd_gusclassic_suspend, 227 .suspend = snd_gusclassic_suspend,
227 .remove = snd_gusclassic_remove, 228 .remove = snd_gusclassic_remove,
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c
index bc10cc26e5f..0b9c2426b49 100644
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
@@ -89,13 +89,14 @@ MODULE_PARM_DESC(channels, "GF1 channels for " CRD_NAME " driver.");
89module_param_array(pcm_channels, int, NULL, 0444); 89module_param_array(pcm_channels, int, NULL, 0444);
90MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for " CRD_NAME " driver."); 90MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for " CRD_NAME " driver.");
91 91
92static int __devinit snd_gusextreme_match(struct device *dev, unsigned int n) 92static int snd_gusextreme_match(struct device *dev, unsigned int n)
93{ 93{
94 return enable[n]; 94 return enable[n];
95} 95}
96 96
97static int __devinit snd_gusextreme_es1688_create(struct snd_card *card, 97static int snd_gusextreme_es1688_create(struct snd_card *card,
98 struct snd_es1688 *chip, struct device *dev, unsigned int n) 98 struct snd_es1688 *chip,
99 struct device *dev, unsigned int n)
99{ 100{
100 static long possible_ports[] = {0x220, 0x240, 0x260}; 101 static long possible_ports[] = {0x220, 0x240, 0x260};
101 static int possible_irqs[] = {5, 9, 10, 7, -1}; 102 static int possible_irqs[] = {5, 9, 10, 7, -1};
@@ -132,8 +133,9 @@ static int __devinit snd_gusextreme_es1688_create(struct snd_card *card,
132 return error; 133 return error;
133} 134}
134 135
135static int __devinit snd_gusextreme_gus_card_create(struct snd_card *card, 136static int snd_gusextreme_gus_card_create(struct snd_card *card,
136 struct device *dev, unsigned int n, struct snd_gus_card **rgus) 137 struct device *dev, unsigned int n,
138 struct snd_gus_card **rgus)
137{ 139{
138 static int possible_irqs[] = {11, 12, 15, 9, 5, 7, 3, -1}; 140 static int possible_irqs[] = {11, 12, 15, 9, 5, 7, 3, -1};
139 static int possible_dmas[] = {5, 6, 7, 3, 1, -1}; 141 static int possible_dmas[] = {5, 6, 7, 3, 1, -1};
@@ -156,8 +158,8 @@ static int __devinit snd_gusextreme_gus_card_create(struct snd_card *card,
156 0, channels[n], pcm_channels[n], 0, rgus); 158 0, channels[n], pcm_channels[n], 0, rgus);
157} 159}
158 160
159static int __devinit snd_gusextreme_detect(struct snd_gus_card *gus, 161static int snd_gusextreme_detect(struct snd_gus_card *gus,
160 struct snd_es1688 *es1688) 162 struct snd_es1688 *es1688)
161{ 163{
162 unsigned long flags; 164 unsigned long flags;
163 unsigned char d; 165 unsigned char d;
@@ -206,7 +208,7 @@ static int __devinit snd_gusextreme_detect(struct snd_gus_card *gus,
206 return 0; 208 return 0;
207} 209}
208 210
209static int __devinit snd_gusextreme_mixer(struct snd_card *card) 211static int snd_gusextreme_mixer(struct snd_card *card)
210{ 212{
211 struct snd_ctl_elem_id id1, id2; 213 struct snd_ctl_elem_id id1, id2;
212 int error; 214 int error;
@@ -232,7 +234,7 @@ static int __devinit snd_gusextreme_mixer(struct snd_card *card)
232 return 0; 234 return 0;
233} 235}
234 236
235static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n) 237static int snd_gusextreme_probe(struct device *dev, unsigned int n)
236{ 238{
237 struct snd_card *card; 239 struct snd_card *card;
238 struct snd_gus_card *gus; 240 struct snd_gus_card *gus;
@@ -339,7 +341,7 @@ out: snd_card_free(card);
339 return error; 341 return error;
340} 342}
341 343
342static int __devexit snd_gusextreme_remove(struct device *dev, unsigned int n) 344static int snd_gusextreme_remove(struct device *dev, unsigned int n)
343{ 345{
344 snd_card_free(dev_get_drvdata(dev)); 346 snd_card_free(dev_get_drvdata(dev));
345 dev_set_drvdata(dev, NULL); 347 dev_set_drvdata(dev, NULL);
@@ -349,7 +351,7 @@ static int __devexit snd_gusextreme_remove(struct device *dev, unsigned int n)
349static struct isa_driver snd_gusextreme_driver = { 351static struct isa_driver snd_gusextreme_driver = {
350 .match = snd_gusextreme_match, 352 .match = snd_gusextreme_match,
351 .probe = snd_gusextreme_probe, 353 .probe = snd_gusextreme_probe,
352 .remove = __devexit_p(snd_gusextreme_remove), 354 .remove = snd_gusextreme_remove,
353#if 0 /* FIXME */ 355#if 0 /* FIXME */
354 .suspend = snd_gusextreme_suspend, 356 .suspend = snd_gusextreme_suspend,
355 .resume = snd_gusextreme_resume, 357 .resume = snd_gusextreme_resume,
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index 41c3f448745..c309a5d0e7e 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -82,7 +82,7 @@ struct snd_gusmax {
82 82
83#define PFX "gusmax: " 83#define PFX "gusmax: "
84 84
85static int __devinit snd_gusmax_detect(struct snd_gus_card * gus) 85static int snd_gusmax_detect(struct snd_gus_card *gus)
86{ 86{
87 unsigned char d; 87 unsigned char d;
88 88
@@ -124,8 +124,8 @@ static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id)
124 return IRQ_RETVAL(handled); 124 return IRQ_RETVAL(handled);
125} 125}
126 126
127static void __devinit snd_gusmax_init(int dev, struct snd_card *card, 127static void snd_gusmax_init(int dev, struct snd_card *card,
128 struct snd_gus_card * gus) 128 struct snd_gus_card *gus)
129{ 129{
130 gus->equal_irq = 1; 130 gus->equal_irq = 1;
131 gus->codec_flag = 1; 131 gus->codec_flag = 1;
@@ -140,7 +140,7 @@ static void __devinit snd_gusmax_init(int dev, struct snd_card *card,
140 outb(gus->max_cntrl_val, GUSP(gus, MAXCNTRLPORT)); 140 outb(gus->max_cntrl_val, GUSP(gus, MAXCNTRLPORT));
141} 141}
142 142
143static int __devinit snd_gusmax_mixer(struct snd_wss *chip) 143static int snd_gusmax_mixer(struct snd_wss *chip)
144{ 144{
145 struct snd_card *card = chip->card; 145 struct snd_card *card = chip->card;
146 struct snd_ctl_elem_id id1, id2; 146 struct snd_ctl_elem_id id1, id2;
@@ -199,12 +199,12 @@ static void snd_gusmax_free(struct snd_card *card)
199 free_irq(maxcard->irq, (void *)maxcard); 199 free_irq(maxcard->irq, (void *)maxcard);
200} 200}
201 201
202static int __devinit snd_gusmax_match(struct device *pdev, unsigned int dev) 202static int snd_gusmax_match(struct device *pdev, unsigned int dev)
203{ 203{
204 return enable[dev]; 204 return enable[dev];
205} 205}
206 206
207static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev) 207static int snd_gusmax_probe(struct device *pdev, unsigned int dev)
208{ 208{
209 static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1}; 209 static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
210 static int possible_dmas[] = {5, 6, 7, 1, 3, -1}; 210 static int possible_dmas[] = {5, 6, 7, 1, 3, -1};
@@ -354,7 +354,7 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)
354 return err; 354 return err;
355} 355}
356 356
357static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev) 357static int snd_gusmax_remove(struct device *devptr, unsigned int dev)
358{ 358{
359 snd_card_free(dev_get_drvdata(devptr)); 359 snd_card_free(dev_get_drvdata(devptr));
360 dev_set_drvdata(devptr, NULL); 360 dev_set_drvdata(devptr, NULL);
@@ -366,7 +366,7 @@ static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev)
366static struct isa_driver snd_gusmax_driver = { 366static struct isa_driver snd_gusmax_driver = {
367 .match = snd_gusmax_match, 367 .match = snd_gusmax_match,
368 .probe = snd_gusmax_probe, 368 .probe = snd_gusmax_probe,
369 .remove = __devexit_p(snd_gusmax_remove), 369 .remove = snd_gusmax_remove,
370 /* FIXME: suspend/resume */ 370 /* FIXME: suspend/resume */
371 .driver = { 371 .driver = {
372 .name = DEV_NAME 372 .name = DEV_NAME
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index 3fc8b66fd16..78bc5744e89 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -207,9 +207,9 @@ static struct snd_i2c_bit_ops snd_interwave_i2c_bit_ops = {
207 .getdata = snd_interwave_i2c_getdataline, 207 .getdata = snd_interwave_i2c_getdataline,
208}; 208};
209 209
210static int __devinit snd_interwave_detect_stb(struct snd_interwave *iwcard, 210static int snd_interwave_detect_stb(struct snd_interwave *iwcard,
211 struct snd_gus_card * gus, int dev, 211 struct snd_gus_card *gus, int dev,
212 struct snd_i2c_bus **rbus) 212 struct snd_i2c_bus **rbus)
213{ 213{
214 unsigned long port; 214 unsigned long port;
215 struct snd_i2c_bus *bus; 215 struct snd_i2c_bus *bus;
@@ -249,11 +249,11 @@ static int __devinit snd_interwave_detect_stb(struct snd_interwave *iwcard,
249} 249}
250#endif 250#endif
251 251
252static int __devinit snd_interwave_detect(struct snd_interwave *iwcard, 252static int snd_interwave_detect(struct snd_interwave *iwcard,
253 struct snd_gus_card * gus, 253 struct snd_gus_card *gus,
254 int dev 254 int dev
255#ifdef SNDRV_STB 255#ifdef SNDRV_STB
256 , struct snd_i2c_bus **rbus 256 , struct snd_i2c_bus **rbus
257#endif 257#endif
258 ) 258 )
259{ 259{
@@ -318,7 +318,7 @@ static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id)
318 return IRQ_RETVAL(handled); 318 return IRQ_RETVAL(handled);
319} 319}
320 320
321static void __devinit snd_interwave_reset(struct snd_gus_card * gus) 321static void snd_interwave_reset(struct snd_gus_card *gus)
322{ 322{
323 snd_gf1_write8(gus, SNDRV_GF1_GB_RESET, 0x00); 323 snd_gf1_write8(gus, SNDRV_GF1_GB_RESET, 0x00);
324 udelay(160); 324 udelay(160);
@@ -326,7 +326,7 @@ static void __devinit snd_interwave_reset(struct snd_gus_card * gus)
326 udelay(160); 326 udelay(160);
327} 327}
328 328
329static void __devinit snd_interwave_bank_sizes(struct snd_gus_card * gus, int *sizes) 329static void snd_interwave_bank_sizes(struct snd_gus_card *gus, int *sizes)
330{ 330{
331 unsigned int idx; 331 unsigned int idx;
332 unsigned int local; 332 unsigned int local;
@@ -377,7 +377,7 @@ struct rom_hdr {
377 /* 511 */ unsigned char csum; 377 /* 511 */ unsigned char csum;
378}; 378};
379 379
380static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus) 380static void snd_interwave_detect_memory(struct snd_gus_card *gus)
381{ 381{
382 static unsigned int lmc[13] = 382 static unsigned int lmc[13] =
383 { 383 {
@@ -475,7 +475,7 @@ static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus)
475 snd_interwave_reset(gus); 475 snd_interwave_reset(gus);
476} 476}
477 477
478static void __devinit snd_interwave_init(int dev, struct snd_gus_card * gus) 478static void snd_interwave_init(int dev, struct snd_gus_card *gus)
479{ 479{
480 unsigned long flags; 480 unsigned long flags;
481 481
@@ -508,7 +508,7 @@ WSS_DOUBLE("Mic Playback Volume", 0,
508 CS4231_LEFT_MIC_INPUT, CS4231_RIGHT_MIC_INPUT, 0, 0, 31, 1) 508 CS4231_LEFT_MIC_INPUT, CS4231_RIGHT_MIC_INPUT, 0, 0, 31, 1)
509}; 509};
510 510
511static int __devinit snd_interwave_mixer(struct snd_wss *chip) 511static int snd_interwave_mixer(struct snd_wss *chip)
512{ 512{
513 struct snd_card *card = chip->card; 513 struct snd_card *card = chip->card;
514 struct snd_ctl_elem_id id1, id2; 514 struct snd_ctl_elem_id id1, id2;
@@ -558,9 +558,9 @@ static int __devinit snd_interwave_mixer(struct snd_wss *chip)
558 558
559#ifdef CONFIG_PNP 559#ifdef CONFIG_PNP
560 560
561static int __devinit snd_interwave_pnp(int dev, struct snd_interwave *iwcard, 561static int snd_interwave_pnp(int dev, struct snd_interwave *iwcard,
562 struct pnp_card_link *card, 562 struct pnp_card_link *card,
563 const struct pnp_card_device_id *id) 563 const struct pnp_card_device_id *id)
564{ 564{
565 struct pnp_dev *pdev; 565 struct pnp_dev *pdev;
566 int err; 566 int err;
@@ -644,7 +644,7 @@ static int snd_interwave_card_new(int dev, struct snd_card **cardp)
644 return 0; 644 return 0;
645} 645}
646 646
647static int __devinit snd_interwave_probe(struct snd_card *card, int dev) 647static int snd_interwave_probe(struct snd_card *card, int dev)
648{ 648{
649 int xirq, xdma1, xdma2; 649 int xirq, xdma1, xdma2;
650 struct snd_interwave *iwcard = card->private_data; 650 struct snd_interwave *iwcard = card->private_data;
@@ -775,7 +775,7 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)
775 return 0; 775 return 0;
776} 776}
777 777
778static int __devinit snd_interwave_isa_probe1(int dev, struct device *devptr) 778static int snd_interwave_isa_probe1(int dev, struct device *devptr)
779{ 779{
780 struct snd_card *card; 780 struct snd_card *card;
781 int err; 781 int err;
@@ -793,8 +793,8 @@ static int __devinit snd_interwave_isa_probe1(int dev, struct device *devptr)
793 return 0; 793 return 0;
794} 794}
795 795
796static int __devinit snd_interwave_isa_match(struct device *pdev, 796static int snd_interwave_isa_match(struct device *pdev,
797 unsigned int dev) 797 unsigned int dev)
798{ 798{
799 if (!enable[dev]) 799 if (!enable[dev])
800 return 0; 800 return 0;
@@ -805,8 +805,8 @@ static int __devinit snd_interwave_isa_match(struct device *pdev,
805 return 1; 805 return 1;
806} 806}
807 807
808static int __devinit snd_interwave_isa_probe(struct device *pdev, 808static int snd_interwave_isa_probe(struct device *pdev,
809 unsigned int dev) 809 unsigned int dev)
810{ 810{
811 int err; 811 int err;
812 static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1}; 812 static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
@@ -846,7 +846,7 @@ static int __devinit snd_interwave_isa_probe(struct device *pdev,
846 } 846 }
847} 847}
848 848
849static int __devexit snd_interwave_isa_remove(struct device *devptr, unsigned int dev) 849static int snd_interwave_isa_remove(struct device *devptr, unsigned int dev)
850{ 850{
851 snd_card_free(dev_get_drvdata(devptr)); 851 snd_card_free(dev_get_drvdata(devptr));
852 dev_set_drvdata(devptr, NULL); 852 dev_set_drvdata(devptr, NULL);
@@ -856,7 +856,7 @@ static int __devexit snd_interwave_isa_remove(struct device *devptr, unsigned in
856static struct isa_driver snd_interwave_driver = { 856static struct isa_driver snd_interwave_driver = {
857 .match = snd_interwave_isa_match, 857 .match = snd_interwave_isa_match,
858 .probe = snd_interwave_isa_probe, 858 .probe = snd_interwave_isa_probe,
859 .remove = __devexit_p(snd_interwave_isa_remove), 859 .remove = snd_interwave_isa_remove,
860 /* FIXME: suspend,resume */ 860 /* FIXME: suspend,resume */
861 .driver = { 861 .driver = {
862 .name = INTERWAVE_DRIVER 862 .name = INTERWAVE_DRIVER
@@ -864,8 +864,8 @@ static struct isa_driver snd_interwave_driver = {
864}; 864};
865 865
866#ifdef CONFIG_PNP 866#ifdef CONFIG_PNP
867static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard, 867static int snd_interwave_pnp_detect(struct pnp_card_link *pcard,
868 const struct pnp_card_device_id *pid) 868 const struct pnp_card_device_id *pid)
869{ 869{
870 static int dev; 870 static int dev;
871 struct snd_card *card; 871 struct snd_card *card;
@@ -896,7 +896,7 @@ static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard,
896 return 0; 896 return 0;
897} 897}
898 898
899static void __devexit snd_interwave_pnp_remove(struct pnp_card_link * pcard) 899static void snd_interwave_pnp_remove(struct pnp_card_link *pcard)
900{ 900{
901 snd_card_free(pnp_get_card_drvdata(pcard)); 901 snd_card_free(pnp_get_card_drvdata(pcard));
902 pnp_set_card_drvdata(pcard, NULL); 902 pnp_set_card_drvdata(pcard, NULL);
@@ -907,7 +907,7 @@ static struct pnp_card_driver interwave_pnpc_driver = {
907 .name = INTERWAVE_PNP_DRIVER, 907 .name = INTERWAVE_PNP_DRIVER,
908 .id_table = snd_interwave_pnpids, 908 .id_table = snd_interwave_pnpids,
909 .probe = snd_interwave_pnp_detect, 909 .probe = snd_interwave_pnp_detect,
910 .remove = __devexit_p(snd_interwave_pnp_remove), 910 .remove = snd_interwave_pnp_remove,
911 /* FIXME: suspend,resume */ 911 /* FIXME: suspend,resume */
912}; 912};
913 913
diff --git a/sound/isa/msnd/msnd.h b/sound/isa/msnd/msnd.h
index a168ba3313a..dbac3a42347 100644
--- a/sound/isa/msnd/msnd.h
+++ b/sound/isa/msnd/msnd.h
@@ -303,6 +303,6 @@ int snd_msndmidi_new(struct snd_card *card, int device);
303void snd_msndmidi_input_read(void *mpu); 303void snd_msndmidi_input_read(void *mpu);
304 304
305void snd_msndmix_setup(struct snd_msnd *chip); 305void snd_msndmix_setup(struct snd_msnd *chip);
306int __devinit snd_msndmix_new(struct snd_card *card); 306int snd_msndmix_new(struct snd_card *card);
307int snd_msndmix_force_recsrc(struct snd_msnd *chip, int recsrc); 307int snd_msndmix_force_recsrc(struct snd_msnd *chip, int recsrc);
308#endif /* __MSND_H */ 308#endif /* __MSND_H */
diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c
index 29cc8e162b0..ddabb406b14 100644
--- a/sound/isa/msnd/msnd_pinnacle.c
+++ b/sound/isa/msnd/msnd_pinnacle.c
@@ -78,7 +78,7 @@
78# define LOGNAME "snd_msnd_pinnacle" 78# define LOGNAME "snd_msnd_pinnacle"
79#endif 79#endif
80 80
81static void __devinit set_default_audio_parameters(struct snd_msnd *chip) 81static void set_default_audio_parameters(struct snd_msnd *chip)
82{ 82{
83 chip->play_sample_size = DEFSAMPLESIZE; 83 chip->play_sample_size = DEFSAMPLESIZE;
84 chip->play_sample_rate = DEFSAMPLERATE; 84 chip->play_sample_rate = DEFSAMPLERATE;
@@ -213,7 +213,7 @@ static int snd_msnd_reset_dsp(long io, unsigned char *info)
213 return -EIO; 213 return -EIO;
214} 214}
215 215
216static int __devinit snd_msnd_probe(struct snd_card *card) 216static int snd_msnd_probe(struct snd_card *card)
217{ 217{
218 struct snd_msnd *chip = card->private_data; 218 struct snd_msnd *chip = card->private_data;
219 unsigned char info; 219 unsigned char info;
@@ -497,7 +497,7 @@ static int snd_msnd_send_dsp_cmd_chk(struct snd_msnd *chip, u8 cmd)
497 return snd_msnd_send_dsp_cmd(chip, cmd); 497 return snd_msnd_send_dsp_cmd(chip, cmd);
498} 498}
499 499
500static int __devinit snd_msnd_calibrate_adc(struct snd_msnd *chip, u16 srate) 500static int snd_msnd_calibrate_adc(struct snd_msnd *chip, u16 srate)
501{ 501{
502 snd_printdd("snd_msnd_calibrate_adc(%i)\n", srate); 502 snd_printdd("snd_msnd_calibrate_adc(%i)\n", srate);
503 writew(srate, chip->SMA + SMA_wCalFreqAtoD); 503 writew(srate, chip->SMA + SMA_wCalFreqAtoD);
@@ -535,7 +535,7 @@ static void snd_msnd_mpu401_close(struct snd_mpu401 *mpu)
535static long mpu_io[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; 535static long mpu_io[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
536static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; 536static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;
537 537
538static int __devinit snd_msnd_attach(struct snd_card *card) 538static int snd_msnd_attach(struct snd_card *card)
539{ 539{
540 struct snd_msnd *chip = card->private_data; 540 struct snd_msnd *chip = card->private_data;
541 int err; 541 int err;
@@ -634,7 +634,7 @@ err_release_region:
634} 634}
635 635
636 636
637static void __devexit snd_msnd_unload(struct snd_card *card) 637static void snd_msnd_unload(struct snd_card *card)
638{ 638{
639 struct snd_msnd *chip = card->private_data; 639 struct snd_msnd *chip = card->private_data;
640 640
@@ -649,7 +649,7 @@ static void __devexit snd_msnd_unload(struct snd_card *card)
649 649
650/* Pinnacle/Fiji Logical Device Configuration */ 650/* Pinnacle/Fiji Logical Device Configuration */
651 651
652static int __devinit snd_msnd_write_cfg(int cfg, int reg, int value) 652static int snd_msnd_write_cfg(int cfg, int reg, int value)
653{ 653{
654 outb(reg, cfg); 654 outb(reg, cfg);
655 outb(value, cfg + 1); 655 outb(value, cfg + 1);
@@ -660,7 +660,7 @@ static int __devinit snd_msnd_write_cfg(int cfg, int reg, int value)
660 return 0; 660 return 0;
661} 661}
662 662
663static int __devinit snd_msnd_write_cfg_io0(int cfg, int num, u16 io) 663static int snd_msnd_write_cfg_io0(int cfg, int num, u16 io)
664{ 664{
665 if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) 665 if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))
666 return -EIO; 666 return -EIO;
@@ -671,7 +671,7 @@ static int __devinit snd_msnd_write_cfg_io0(int cfg, int num, u16 io)
671 return 0; 671 return 0;
672} 672}
673 673
674static int __devinit snd_msnd_write_cfg_io1(int cfg, int num, u16 io) 674static int snd_msnd_write_cfg_io1(int cfg, int num, u16 io)
675{ 675{
676 if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) 676 if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))
677 return -EIO; 677 return -EIO;
@@ -682,7 +682,7 @@ static int __devinit snd_msnd_write_cfg_io1(int cfg, int num, u16 io)
682 return 0; 682 return 0;
683} 683}
684 684
685static int __devinit snd_msnd_write_cfg_irq(int cfg, int num, u16 irq) 685static int snd_msnd_write_cfg_irq(int cfg, int num, u16 irq)
686{ 686{
687 if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) 687 if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))
688 return -EIO; 688 return -EIO;
@@ -693,7 +693,7 @@ static int __devinit snd_msnd_write_cfg_irq(int cfg, int num, u16 irq)
693 return 0; 693 return 0;
694} 694}
695 695
696static int __devinit snd_msnd_write_cfg_mem(int cfg, int num, int mem) 696static int snd_msnd_write_cfg_mem(int cfg, int num, int mem)
697{ 697{
698 u16 wmem; 698 u16 wmem;
699 699
@@ -711,7 +711,7 @@ static int __devinit snd_msnd_write_cfg_mem(int cfg, int num, int mem)
711 return 0; 711 return 0;
712} 712}
713 713
714static int __devinit snd_msnd_activate_logical(int cfg, int num) 714static int snd_msnd_activate_logical(int cfg, int num)
715{ 715{
716 if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) 716 if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))
717 return -EIO; 717 return -EIO;
@@ -720,8 +720,8 @@ static int __devinit snd_msnd_activate_logical(int cfg, int num)
720 return 0; 720 return 0;
721} 721}
722 722
723static int __devinit snd_msnd_write_cfg_logical(int cfg, int num, u16 io0, 723static int snd_msnd_write_cfg_logical(int cfg, int num, u16 io0,
724 u16 io1, u16 irq, int mem) 724 u16 io1, u16 irq, int mem)
725{ 725{
726 if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) 726 if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))
727 return -EIO; 727 return -EIO;
@@ -738,7 +738,7 @@ static int __devinit snd_msnd_write_cfg_logical(int cfg, int num, u16 io0,
738 return 0; 738 return 0;
739} 739}
740 740
741static int __devinit snd_msnd_pinnacle_cfg_reset(int cfg) 741static int snd_msnd_pinnacle_cfg_reset(int cfg)
742{ 742{
743 int i; 743 int i;
744 744
@@ -818,7 +818,7 @@ module_param_array(joystick_io, long, NULL, S_IRUGO);
818#endif 818#endif
819 819
820 820
821static int __devinit snd_msnd_isa_match(struct device *pdev, unsigned int i) 821static int snd_msnd_isa_match(struct device *pdev, unsigned int i)
822{ 822{
823 if (io[i] == SNDRV_AUTO_PORT) 823 if (io[i] == SNDRV_AUTO_PORT)
824 return 0; 824 return 0;
@@ -888,7 +888,7 @@ static int __devinit snd_msnd_isa_match(struct device *pdev, unsigned int i)
888 return 1; 888 return 1;
889} 889}
890 890
891static int __devinit snd_msnd_isa_probe(struct device *pdev, unsigned int idx) 891static int snd_msnd_isa_probe(struct device *pdev, unsigned int idx)
892{ 892{
893 int err; 893 int err;
894 struct snd_card *card; 894 struct snd_card *card;
@@ -1061,7 +1061,7 @@ cfg_error:
1061#endif 1061#endif
1062} 1062}
1063 1063
1064static int __devexit snd_msnd_isa_remove(struct device *pdev, unsigned int dev) 1064static int snd_msnd_isa_remove(struct device *pdev, unsigned int dev)
1065{ 1065{
1066 snd_msnd_unload(dev_get_drvdata(pdev)); 1066 snd_msnd_unload(dev_get_drvdata(pdev));
1067 dev_set_drvdata(pdev, NULL); 1067 dev_set_drvdata(pdev, NULL);
@@ -1073,7 +1073,7 @@ static int __devexit snd_msnd_isa_remove(struct device *pdev, unsigned int dev)
1073static struct isa_driver snd_msnd_driver = { 1073static struct isa_driver snd_msnd_driver = {
1074 .match = snd_msnd_isa_match, 1074 .match = snd_msnd_isa_match,
1075 .probe = snd_msnd_isa_probe, 1075 .probe = snd_msnd_isa_probe,
1076 .remove = __devexit_p(snd_msnd_isa_remove), 1076 .remove = snd_msnd_isa_remove,
1077 /* FIXME: suspend, resume */ 1077 /* FIXME: suspend, resume */
1078 .driver = { 1078 .driver = {
1079 .name = DEV_NAME 1079 .name = DEV_NAME
@@ -1081,8 +1081,8 @@ static struct isa_driver snd_msnd_driver = {
1081}; 1081};
1082 1082
1083#ifdef CONFIG_PNP 1083#ifdef CONFIG_PNP
1084static int __devinit snd_msnd_pnp_detect(struct pnp_card_link *pcard, 1084static int snd_msnd_pnp_detect(struct pnp_card_link *pcard,
1085 const struct pnp_card_device_id *pid) 1085 const struct pnp_card_device_id *pid)
1086{ 1086{
1087 static int idx; 1087 static int idx;
1088 struct pnp_dev *pnp_dev; 1088 struct pnp_dev *pnp_dev;
@@ -1185,7 +1185,7 @@ _release_card:
1185 return ret; 1185 return ret;
1186} 1186}
1187 1187
1188static void __devexit snd_msnd_pnp_remove(struct pnp_card_link *pcard) 1188static void snd_msnd_pnp_remove(struct pnp_card_link *pcard)
1189{ 1189{
1190 snd_msnd_unload(pnp_get_card_drvdata(pcard)); 1190 snd_msnd_unload(pnp_get_card_drvdata(pcard));
1191 pnp_set_card_drvdata(pcard, NULL); 1191 pnp_set_card_drvdata(pcard, NULL);
@@ -1207,7 +1207,7 @@ static struct pnp_card_driver msnd_pnpc_driver = {
1207 .name = "msnd_pinnacle", 1207 .name = "msnd_pinnacle",
1208 .id_table = msnd_pnpids, 1208 .id_table = msnd_pnpids,
1209 .probe = snd_msnd_pnp_detect, 1209 .probe = snd_msnd_pnp_detect,
1210 .remove = __devexit_p(snd_msnd_pnp_remove), 1210 .remove = snd_msnd_pnp_remove,
1211}; 1211};
1212#endif /* CONFIG_PNP */ 1212#endif /* CONFIG_PNP */
1213 1213
diff --git a/sound/isa/msnd/msnd_pinnacle_mixer.c b/sound/isa/msnd/msnd_pinnacle_mixer.c
index 1de59d44142..031dc69b747 100644
--- a/sound/isa/msnd/msnd_pinnacle_mixer.c
+++ b/sound/isa/msnd/msnd_pinnacle_mixer.c
@@ -302,7 +302,7 @@ DUMMY_VOLUME("Monitor", 0, MSND_MIXER_IMIX),
302}; 302};
303 303
304 304
305int __devinit snd_msndmix_new(struct snd_card *card) 305int snd_msndmix_new(struct snd_card *card)
306{ 306{
307 struct snd_msnd *chip = card->private_data; 307 struct snd_msnd *chip = card->private_data;
308 unsigned int idx; 308 unsigned int idx;
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index f6cc0b917ef..075777a6cf0 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -221,7 +221,7 @@ static void snd_opl3sa2_write(struct snd_opl3sa2 *chip, unsigned char reg, unsig
221 spin_unlock_irqrestore(&chip->reg_lock, flags); 221 spin_unlock_irqrestore(&chip->reg_lock, flags);
222} 222}
223 223
224static int __devinit snd_opl3sa2_detect(struct snd_card *card) 224static int snd_opl3sa2_detect(struct snd_card *card)
225{ 225{
226 struct snd_opl3sa2 *chip = card->private_data; 226 struct snd_opl3sa2 *chip = card->private_data;
227 unsigned long port; 227 unsigned long port;
@@ -496,7 +496,7 @@ static void snd_opl3sa2_master_free(struct snd_kcontrol *kcontrol)
496 chip->master_volume = NULL; 496 chip->master_volume = NULL;
497} 497}
498 498
499static int __devinit snd_opl3sa2_mixer(struct snd_card *card) 499static int snd_opl3sa2_mixer(struct snd_card *card)
500{ 500{
501 struct snd_opl3sa2 *chip = card->private_data; 501 struct snd_opl3sa2 *chip = card->private_data;
502 struct snd_ctl_elem_id id1, id2; 502 struct snd_ctl_elem_id id1, id2;
@@ -596,8 +596,8 @@ static int snd_opl3sa2_resume(struct snd_card *card)
596#endif /* CONFIG_PM */ 596#endif /* CONFIG_PM */
597 597
598#ifdef CONFIG_PNP 598#ifdef CONFIG_PNP
599static int __devinit snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip, 599static int snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,
600 struct pnp_dev *pdev) 600 struct pnp_dev *pdev)
601{ 601{
602 if (pnp_activate_dev(pdev) < 0) { 602 if (pnp_activate_dev(pdev) < 0) {
603 snd_printk(KERN_ERR "PnP configure failure (out of resources?)\n"); 603 snd_printk(KERN_ERR "PnP configure failure (out of resources?)\n");
@@ -647,7 +647,7 @@ static int snd_opl3sa2_card_new(int dev, struct snd_card **cardp)
647 return 0; 647 return 0;
648} 648}
649 649
650static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev) 650static int snd_opl3sa2_probe(struct snd_card *card, int dev)
651{ 651{
652 int xirq, xdma1, xdma2; 652 int xirq, xdma1, xdma2;
653 struct snd_opl3sa2 *chip; 653 struct snd_opl3sa2 *chip;
@@ -721,8 +721,8 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)
721} 721}
722 722
723#ifdef CONFIG_PNP 723#ifdef CONFIG_PNP
724static int __devinit snd_opl3sa2_pnp_detect(struct pnp_dev *pdev, 724static int snd_opl3sa2_pnp_detect(struct pnp_dev *pdev,
725 const struct pnp_device_id *id) 725 const struct pnp_device_id *id)
726{ 726{
727 static int dev; 727 static int dev;
728 int err; 728 int err;
@@ -754,7 +754,7 @@ static int __devinit snd_opl3sa2_pnp_detect(struct pnp_dev *pdev,
754 return 0; 754 return 0;
755} 755}
756 756
757static void __devexit snd_opl3sa2_pnp_remove(struct pnp_dev * pdev) 757static void snd_opl3sa2_pnp_remove(struct pnp_dev *pdev)
758{ 758{
759 snd_card_free(pnp_get_drvdata(pdev)); 759 snd_card_free(pnp_get_drvdata(pdev));
760 pnp_set_drvdata(pdev, NULL); 760 pnp_set_drvdata(pdev, NULL);
@@ -775,15 +775,15 @@ static struct pnp_driver opl3sa2_pnp_driver = {
775 .name = "snd-opl3sa2-pnpbios", 775 .name = "snd-opl3sa2-pnpbios",
776 .id_table = snd_opl3sa2_pnpbiosids, 776 .id_table = snd_opl3sa2_pnpbiosids,
777 .probe = snd_opl3sa2_pnp_detect, 777 .probe = snd_opl3sa2_pnp_detect,
778 .remove = __devexit_p(snd_opl3sa2_pnp_remove), 778 .remove = snd_opl3sa2_pnp_remove,
779#ifdef CONFIG_PM 779#ifdef CONFIG_PM
780 .suspend = snd_opl3sa2_pnp_suspend, 780 .suspend = snd_opl3sa2_pnp_suspend,
781 .resume = snd_opl3sa2_pnp_resume, 781 .resume = snd_opl3sa2_pnp_resume,
782#endif 782#endif
783}; 783};
784 784
785static int __devinit snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard, 785static int snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard,
786 const struct pnp_card_device_id *id) 786 const struct pnp_card_device_id *id)
787{ 787{
788 static int dev; 788 static int dev;
789 struct pnp_dev *pdev; 789 struct pnp_dev *pdev;
@@ -820,7 +820,7 @@ static int __devinit snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard,
820 return 0; 820 return 0;
821} 821}
822 822
823static void __devexit snd_opl3sa2_pnp_cremove(struct pnp_card_link * pcard) 823static void snd_opl3sa2_pnp_cremove(struct pnp_card_link *pcard)
824{ 824{
825 snd_card_free(pnp_get_card_drvdata(pcard)); 825 snd_card_free(pnp_get_card_drvdata(pcard));
826 pnp_set_card_drvdata(pcard, NULL); 826 pnp_set_card_drvdata(pcard, NULL);
@@ -842,7 +842,7 @@ static struct pnp_card_driver opl3sa2_pnpc_driver = {
842 .name = "snd-opl3sa2-cpnp", 842 .name = "snd-opl3sa2-cpnp",
843 .id_table = snd_opl3sa2_pnpids, 843 .id_table = snd_opl3sa2_pnpids,
844 .probe = snd_opl3sa2_pnp_cdetect, 844 .probe = snd_opl3sa2_pnp_cdetect,
845 .remove = __devexit_p(snd_opl3sa2_pnp_cremove), 845 .remove = snd_opl3sa2_pnp_cremove,
846#ifdef CONFIG_PM 846#ifdef CONFIG_PM
847 .suspend = snd_opl3sa2_pnp_csuspend, 847 .suspend = snd_opl3sa2_pnp_csuspend,
848 .resume = snd_opl3sa2_pnp_cresume, 848 .resume = snd_opl3sa2_pnp_cresume,
@@ -850,8 +850,8 @@ static struct pnp_card_driver opl3sa2_pnpc_driver = {
850}; 850};
851#endif /* CONFIG_PNP */ 851#endif /* CONFIG_PNP */
852 852
853static int __devinit snd_opl3sa2_isa_match(struct device *pdev, 853static int snd_opl3sa2_isa_match(struct device *pdev,
854 unsigned int dev) 854 unsigned int dev)
855{ 855{
856 if (!enable[dev]) 856 if (!enable[dev])
857 return 0; 857 return 0;
@@ -878,8 +878,8 @@ static int __devinit snd_opl3sa2_isa_match(struct device *pdev,
878 return 1; 878 return 1;
879} 879}
880 880
881static int __devinit snd_opl3sa2_isa_probe(struct device *pdev, 881static int snd_opl3sa2_isa_probe(struct device *pdev,
882 unsigned int dev) 882 unsigned int dev)
883{ 883{
884 struct snd_card *card; 884 struct snd_card *card;
885 int err; 885 int err;
@@ -896,8 +896,8 @@ static int __devinit snd_opl3sa2_isa_probe(struct device *pdev,
896 return 0; 896 return 0;
897} 897}
898 898
899static int __devexit snd_opl3sa2_isa_remove(struct device *devptr, 899static int snd_opl3sa2_isa_remove(struct device *devptr,
900 unsigned int dev) 900 unsigned int dev)
901{ 901{
902 snd_card_free(dev_get_drvdata(devptr)); 902 snd_card_free(dev_get_drvdata(devptr));
903 dev_set_drvdata(devptr, NULL); 903 dev_set_drvdata(devptr, NULL);
@@ -922,7 +922,7 @@ static int snd_opl3sa2_isa_resume(struct device *dev, unsigned int n)
922static struct isa_driver snd_opl3sa2_isa_driver = { 922static struct isa_driver snd_opl3sa2_isa_driver = {
923 .match = snd_opl3sa2_isa_match, 923 .match = snd_opl3sa2_isa_match,
924 .probe = snd_opl3sa2_isa_probe, 924 .probe = snd_opl3sa2_isa_probe,
925 .remove = __devexit_p(snd_opl3sa2_isa_remove), 925 .remove = snd_opl3sa2_isa_remove,
926#ifdef CONFIG_PM 926#ifdef CONFIG_PM
927 .suspend = snd_opl3sa2_isa_suspend, 927 .suspend = snd_opl3sa2_isa_suspend,
928 .resume = snd_opl3sa2_isa_resume, 928 .resume = snd_opl3sa2_isa_resume,
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index 4a7ff4e8985..c3da1df9371 100644
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -587,7 +587,7 @@ static int snd_miro_put_double(struct snd_kcontrol *kcontrol,
587 return change; 587 return change;
588} 588}
589 589
590static struct snd_kcontrol_new snd_miro_controls[] __devinitdata = { 590static struct snd_kcontrol_new snd_miro_controls[] = {
591MIRO_DOUBLE("Master Playback Volume", 0, ACI_GET_MASTER, ACI_SET_MASTER), 591MIRO_DOUBLE("Master Playback Volume", 0, ACI_GET_MASTER, ACI_SET_MASTER),
592MIRO_DOUBLE("Mic Playback Volume", 1, ACI_GET_MIC, ACI_SET_MIC), 592MIRO_DOUBLE("Mic Playback Volume", 1, ACI_GET_MIC, ACI_SET_MIC),
593MIRO_DOUBLE("Line Playback Volume", 1, ACI_GET_LINE, ACI_SET_LINE), 593MIRO_DOUBLE("Line Playback Volume", 1, ACI_GET_LINE, ACI_SET_LINE),
@@ -599,7 +599,7 @@ MIRO_DOUBLE("Aux Playback Volume", 2, ACI_GET_LINE2, ACI_SET_LINE2),
599 599
600/* Equalizer with seven bands (only PCM20) 600/* Equalizer with seven bands (only PCM20)
601 from -12dB up to +12dB on each band */ 601 from -12dB up to +12dB on each band */
602static struct snd_kcontrol_new snd_miro_eq_controls[] __devinitdata = { 602static struct snd_kcontrol_new snd_miro_eq_controls[] = {
603MIRO_DOUBLE("Tone Control - 28 Hz", 0, ACI_GET_EQ1, ACI_SET_EQ1), 603MIRO_DOUBLE("Tone Control - 28 Hz", 0, ACI_GET_EQ1, ACI_SET_EQ1),
604MIRO_DOUBLE("Tone Control - 160 Hz", 0, ACI_GET_EQ2, ACI_SET_EQ2), 604MIRO_DOUBLE("Tone Control - 160 Hz", 0, ACI_GET_EQ2, ACI_SET_EQ2),
605MIRO_DOUBLE("Tone Control - 400 Hz", 0, ACI_GET_EQ3, ACI_SET_EQ3), 605MIRO_DOUBLE("Tone Control - 400 Hz", 0, ACI_GET_EQ3, ACI_SET_EQ3),
@@ -609,15 +609,15 @@ MIRO_DOUBLE("Tone Control - 6.3 kHz", 0, ACI_GET_EQ6, ACI_SET_EQ6),
609MIRO_DOUBLE("Tone Control - 16 kHz", 0, ACI_GET_EQ7, ACI_SET_EQ7), 609MIRO_DOUBLE("Tone Control - 16 kHz", 0, ACI_GET_EQ7, ACI_SET_EQ7),
610}; 610};
611 611
612static struct snd_kcontrol_new snd_miro_radio_control[] __devinitdata = { 612static struct snd_kcontrol_new snd_miro_radio_control[] = {
613MIRO_DOUBLE("Radio Playback Volume", 0, ACI_GET_LINE1, ACI_SET_LINE1), 613MIRO_DOUBLE("Radio Playback Volume", 0, ACI_GET_LINE1, ACI_SET_LINE1),
614}; 614};
615 615
616static struct snd_kcontrol_new snd_miro_line_control[] __devinitdata = { 616static struct snd_kcontrol_new snd_miro_line_control[] = {
617MIRO_DOUBLE("Line Playback Volume", 2, ACI_GET_LINE1, ACI_SET_LINE1), 617MIRO_DOUBLE("Line Playback Volume", 2, ACI_GET_LINE1, ACI_SET_LINE1),
618}; 618};
619 619
620static struct snd_kcontrol_new snd_miro_preamp_control[] __devinitdata = { 620static struct snd_kcontrol_new snd_miro_preamp_control[] = {
621{ 621{
622 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 622 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
623 .name = "Mic Boost", 623 .name = "Mic Boost",
@@ -627,7 +627,7 @@ static struct snd_kcontrol_new snd_miro_preamp_control[] __devinitdata = {
627 .put = snd_miro_put_preamp, 627 .put = snd_miro_put_preamp,
628}}; 628}};
629 629
630static struct snd_kcontrol_new snd_miro_amp_control[] __devinitdata = { 630static struct snd_kcontrol_new snd_miro_amp_control[] = {
631{ 631{
632 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 632 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
633 .name = "Line Boost", 633 .name = "Line Boost",
@@ -637,7 +637,7 @@ static struct snd_kcontrol_new snd_miro_amp_control[] __devinitdata = {
637 .put = snd_miro_put_amp, 637 .put = snd_miro_put_amp,
638}}; 638}};
639 639
640static struct snd_kcontrol_new snd_miro_capture_control[] __devinitdata = { 640static struct snd_kcontrol_new snd_miro_capture_control[] = {
641{ 641{
642 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 642 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
643 .name = "PCM Capture Switch", 643 .name = "PCM Capture Switch",
@@ -647,7 +647,7 @@ static struct snd_kcontrol_new snd_miro_capture_control[] __devinitdata = {
647 .put = snd_miro_put_capture, 647 .put = snd_miro_put_capture,
648}}; 648}};
649 649
650static unsigned char aci_init_values[][2] __devinitdata = { 650static unsigned char aci_init_values[][2] = {
651 { ACI_SET_MUTE, 0x00 }, 651 { ACI_SET_MUTE, 0x00 },
652 { ACI_SET_POWERAMP, 0x00 }, 652 { ACI_SET_POWERAMP, 0x00 },
653 { ACI_SET_PREAMP, 0x00 }, 653 { ACI_SET_PREAMP, 0x00 },
@@ -670,7 +670,7 @@ static unsigned char aci_init_values[][2] __devinitdata = {
670 { ACI_SET_MASTER + 1, 0x20 }, 670 { ACI_SET_MASTER + 1, 0x20 },
671}; 671};
672 672
673static int __devinit snd_set_aci_init_values(struct snd_miro *miro) 673static int snd_set_aci_init_values(struct snd_miro *miro)
674{ 674{
675 int idx, error; 675 int idx, error;
676 struct snd_miro_aci *aci = miro->aci; 676 struct snd_miro_aci *aci = miro->aci;
@@ -713,8 +713,8 @@ static int __devinit snd_set_aci_init_values(struct snd_miro *miro)
713 return 0; 713 return 0;
714} 714}
715 715
716static int __devinit snd_miro_mixer(struct snd_card *card, 716static int snd_miro_mixer(struct snd_card *card,
717 struct snd_miro *miro) 717 struct snd_miro *miro)
718{ 718{
719 unsigned int idx; 719 unsigned int idx;
720 int err; 720 int err;
@@ -771,8 +771,8 @@ static int __devinit snd_miro_mixer(struct snd_card *card,
771 return 0; 771 return 0;
772} 772}
773 773
774static int __devinit snd_miro_init(struct snd_miro *chip, 774static int snd_miro_init(struct snd_miro *chip,
775 unsigned short hardware) 775 unsigned short hardware)
776{ 776{
777 static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2}; 777 static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};
778 778
@@ -989,8 +989,8 @@ static void snd_miro_proc_read(struct snd_info_entry * entry,
989 snd_iprintf(buffer, " preamp : 0x%x\n", aci->aci_preamp); 989 snd_iprintf(buffer, " preamp : 0x%x\n", aci->aci_preamp);
990} 990}
991 991
992static void __devinit snd_miro_proc_init(struct snd_card *card, 992static void snd_miro_proc_init(struct snd_card *card,
993 struct snd_miro *miro) 993 struct snd_miro *miro)
994{ 994{
995 struct snd_info_entry *entry; 995 struct snd_info_entry *entry;
996 996
@@ -1002,7 +1002,7 @@ static void __devinit snd_miro_proc_init(struct snd_card *card,
1002 * Init 1002 * Init
1003 */ 1003 */
1004 1004
1005static int __devinit snd_miro_configure(struct snd_miro *chip) 1005static int snd_miro_configure(struct snd_miro *chip)
1006{ 1006{
1007 unsigned char wss_base_bits; 1007 unsigned char wss_base_bits;
1008 unsigned char irq_bits; 1008 unsigned char irq_bits;
@@ -1162,7 +1162,7 @@ __skip_mpu:
1162 return 0; 1162 return 0;
1163} 1163}
1164 1164
1165static int __devinit snd_miro_opti_check(struct snd_miro *chip) 1165static int snd_miro_opti_check(struct snd_miro *chip)
1166{ 1166{
1167 unsigned char value; 1167 unsigned char value;
1168 1168
@@ -1182,8 +1182,8 @@ static int __devinit snd_miro_opti_check(struct snd_miro *chip)
1182 return -ENODEV; 1182 return -ENODEV;
1183} 1183}
1184 1184
1185static int __devinit snd_card_miro_detect(struct snd_card *card, 1185static int snd_card_miro_detect(struct snd_card *card,
1186 struct snd_miro *chip) 1186 struct snd_miro *chip)
1187{ 1187{
1188 int i, err; 1188 int i, err;
1189 1189
@@ -1200,8 +1200,8 @@ static int __devinit snd_card_miro_detect(struct snd_card *card,
1200 return -ENODEV; 1200 return -ENODEV;
1201} 1201}
1202 1202
1203static int __devinit snd_card_miro_aci_detect(struct snd_card *card, 1203static int snd_card_miro_aci_detect(struct snd_card *card,
1204 struct snd_miro *miro) 1204 struct snd_miro *miro)
1205{ 1205{
1206 unsigned char regval; 1206 unsigned char regval;
1207 int i; 1207 int i;
@@ -1265,7 +1265,7 @@ static void snd_card_miro_free(struct snd_card *card)
1265 release_and_free_resource(miro->res_mc_base); 1265 release_and_free_resource(miro->res_mc_base);
1266} 1266}
1267 1267
1268static int __devinit snd_miro_probe(struct snd_card *card) 1268static int snd_miro_probe(struct snd_card *card)
1269{ 1269{
1270 int error; 1270 int error;
1271 struct snd_miro *miro = card->private_data; 1271 struct snd_miro *miro = card->private_data;
@@ -1386,7 +1386,7 @@ static int __devinit snd_miro_probe(struct snd_card *card)
1386 return snd_card_register(card); 1386 return snd_card_register(card);
1387} 1387}
1388 1388
1389static int __devinit snd_miro_isa_match(struct device *devptr, unsigned int n) 1389static int snd_miro_isa_match(struct device *devptr, unsigned int n)
1390{ 1390{
1391#ifdef CONFIG_PNP 1391#ifdef CONFIG_PNP
1392 if (snd_miro_pnp_is_probed) 1392 if (snd_miro_pnp_is_probed)
@@ -1397,7 +1397,7 @@ static int __devinit snd_miro_isa_match(struct device *devptr, unsigned int n)
1397 return 1; 1397 return 1;
1398} 1398}
1399 1399
1400static int __devinit snd_miro_isa_probe(struct device *devptr, unsigned int n) 1400static int snd_miro_isa_probe(struct device *devptr, unsigned int n)
1401{ 1401{
1402 static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1}; 1402 static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};
1403 static long possible_mpu_ports[] = {0x330, 0x300, 0x310, 0x320, -1}; 1403 static long possible_mpu_ports[] = {0x330, 0x300, 0x310, 0x320, -1};
@@ -1491,8 +1491,8 @@ static int __devinit snd_miro_isa_probe(struct device *devptr, unsigned int n)
1491 return 0; 1491 return 0;
1492} 1492}
1493 1493
1494static int __devexit snd_miro_isa_remove(struct device *devptr, 1494static int snd_miro_isa_remove(struct device *devptr,
1495 unsigned int dev) 1495 unsigned int dev)
1496{ 1496{
1497 snd_card_free(dev_get_drvdata(devptr)); 1497 snd_card_free(dev_get_drvdata(devptr));
1498 dev_set_drvdata(devptr, NULL); 1498 dev_set_drvdata(devptr, NULL);
@@ -1504,7 +1504,7 @@ static int __devexit snd_miro_isa_remove(struct device *devptr,
1504static struct isa_driver snd_miro_driver = { 1504static struct isa_driver snd_miro_driver = {
1505 .match = snd_miro_isa_match, 1505 .match = snd_miro_isa_match,
1506 .probe = snd_miro_isa_probe, 1506 .probe = snd_miro_isa_probe,
1507 .remove = __devexit_p(snd_miro_isa_remove), 1507 .remove = snd_miro_isa_remove,
1508 /* FIXME: suspend/resume */ 1508 /* FIXME: suspend/resume */
1509 .driver = { 1509 .driver = {
1510 .name = DEV_NAME 1510 .name = DEV_NAME
@@ -1513,9 +1513,9 @@ static struct isa_driver snd_miro_driver = {
1513 1513
1514#ifdef CONFIG_PNP 1514#ifdef CONFIG_PNP
1515 1515
1516static int __devinit snd_card_miro_pnp(struct snd_miro *chip, 1516static int snd_card_miro_pnp(struct snd_miro *chip,
1517 struct pnp_card_link *card, 1517 struct pnp_card_link *card,
1518 const struct pnp_card_device_id *pid) 1518 const struct pnp_card_device_id *pid)
1519{ 1519{
1520 struct pnp_dev *pdev; 1520 struct pnp_dev *pdev;
1521 int err; 1521 int err;
@@ -1574,8 +1574,8 @@ static int __devinit snd_card_miro_pnp(struct snd_miro *chip,
1574 return 0; 1574 return 0;
1575} 1575}
1576 1576
1577static int __devinit snd_miro_pnp_probe(struct pnp_card_link *pcard, 1577static int snd_miro_pnp_probe(struct pnp_card_link *pcard,
1578 const struct pnp_card_device_id *pid) 1578 const struct pnp_card_device_id *pid)
1579{ 1579{
1580 struct snd_card *card; 1580 struct snd_card *card;
1581 int err; 1581 int err;
@@ -1624,7 +1624,7 @@ static int __devinit snd_miro_pnp_probe(struct pnp_card_link *pcard,
1624 return 0; 1624 return 0;
1625} 1625}
1626 1626
1627static void __devexit snd_miro_pnp_remove(struct pnp_card_link * pcard) 1627static void snd_miro_pnp_remove(struct pnp_card_link *pcard)
1628{ 1628{
1629 snd_card_free(pnp_get_card_drvdata(pcard)); 1629 snd_card_free(pnp_get_card_drvdata(pcard));
1630 pnp_set_card_drvdata(pcard, NULL); 1630 pnp_set_card_drvdata(pcard, NULL);
@@ -1636,7 +1636,7 @@ static struct pnp_card_driver miro_pnpc_driver = {
1636 .name = "miro", 1636 .name = "miro",
1637 .id_table = snd_miro_pnpids, 1637 .id_table = snd_miro_pnpids,
1638 .probe = snd_miro_pnp_probe, 1638 .probe = snd_miro_pnp_probe,
1639 .remove = __devexit_p(snd_miro_pnp_remove), 1639 .remove = snd_miro_pnp_remove,
1640}; 1640};
1641#endif 1641#endif
1642 1642
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 2899c9fd1ce..b41ed8661b2 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -186,8 +186,8 @@ static char * snd_opti9xx_names[] = {
186 "82C930", "82C931", "82C933" 186 "82C930", "82C931", "82C933"
187}; 187};
188 188
189static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip, 189static int snd_opti9xx_init(struct snd_opti9xx *chip,
190 unsigned short hardware) 190 unsigned short hardware)
191{ 191{
192 static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2}; 192 static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};
193 193
@@ -593,7 +593,7 @@ WSS_DOUBLE_TLV("Aux Playback Volume", 0,
593 db_scale_4bit_12db_max), 593 db_scale_4bit_12db_max),
594}; 594};
595 595
596static int __devinit snd_opti93x_mixer(struct snd_wss *chip) 596static int snd_opti93x_mixer(struct snd_wss *chip)
597{ 597{
598 struct snd_card *card; 598 struct snd_card *card;
599 unsigned int idx; 599 unsigned int idx;
@@ -666,7 +666,7 @@ static irqreturn_t snd_opti93x_interrupt(int irq, void *dev_id)
666 666
667#endif /* OPTi93X */ 667#endif /* OPTi93X */
668 668
669static int __devinit snd_opti9xx_read_check(struct snd_opti9xx *chip) 669static int snd_opti9xx_read_check(struct snd_opti9xx *chip)
670{ 670{
671 unsigned char value; 671 unsigned char value;
672#ifdef OPTi93X 672#ifdef OPTi93X
@@ -707,8 +707,8 @@ static int __devinit snd_opti9xx_read_check(struct snd_opti9xx *chip)
707 return -ENODEV; 707 return -ENODEV;
708} 708}
709 709
710static int __devinit snd_card_opti9xx_detect(struct snd_card *card, 710static int snd_card_opti9xx_detect(struct snd_card *card,
711 struct snd_opti9xx *chip) 711 struct snd_opti9xx *chip)
712{ 712{
713 int i, err; 713 int i, err;
714 714
@@ -732,9 +732,9 @@ static int __devinit snd_card_opti9xx_detect(struct snd_card *card,
732} 732}
733 733
734#ifdef CONFIG_PNP 734#ifdef CONFIG_PNP
735static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip, 735static int snd_card_opti9xx_pnp(struct snd_opti9xx *chip,
736 struct pnp_card_link *card, 736 struct pnp_card_link *card,
737 const struct pnp_card_device_id *pid) 737 const struct pnp_card_device_id *pid)
738{ 738{
739 struct pnp_dev *pdev; 739 struct pnp_dev *pdev;
740 int err; 740 int err;
@@ -817,7 +817,7 @@ static void snd_card_opti9xx_free(struct snd_card *card)
817 } 817 }
818} 818}
819 819
820static int __devinit snd_opti9xx_probe(struct snd_card *card) 820static int snd_opti9xx_probe(struct snd_card *card)
821{ 821{
822 static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1}; 822 static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};
823 int error; 823 int error;
@@ -952,8 +952,8 @@ static int snd_opti9xx_card_new(struct snd_card **cardp)
952 return 0; 952 return 0;
953} 953}
954 954
955static int __devinit snd_opti9xx_isa_match(struct device *devptr, 955static int snd_opti9xx_isa_match(struct device *devptr,
956 unsigned int dev) 956 unsigned int dev)
957{ 957{
958#ifdef CONFIG_PNP 958#ifdef CONFIG_PNP
959 if (snd_opti9xx_pnp_is_probed) 959 if (snd_opti9xx_pnp_is_probed)
@@ -964,8 +964,8 @@ static int __devinit snd_opti9xx_isa_match(struct device *devptr,
964 return 1; 964 return 1;
965} 965}
966 966
967static int __devinit snd_opti9xx_isa_probe(struct device *devptr, 967static int snd_opti9xx_isa_probe(struct device *devptr,
968 unsigned int dev) 968 unsigned int dev)
969{ 969{
970 struct snd_card *card; 970 struct snd_card *card;
971 int error; 971 int error;
@@ -1031,8 +1031,8 @@ static int __devinit snd_opti9xx_isa_probe(struct device *devptr,
1031 return 0; 1031 return 0;
1032} 1032}
1033 1033
1034static int __devexit snd_opti9xx_isa_remove(struct device *devptr, 1034static int snd_opti9xx_isa_remove(struct device *devptr,
1035 unsigned int dev) 1035 unsigned int dev)
1036{ 1036{
1037 snd_card_free(dev_get_drvdata(devptr)); 1037 snd_card_free(dev_get_drvdata(devptr));
1038 dev_set_drvdata(devptr, NULL); 1038 dev_set_drvdata(devptr, NULL);
@@ -1083,7 +1083,7 @@ static int snd_opti9xx_isa_resume(struct device *dev, unsigned int n)
1083static struct isa_driver snd_opti9xx_driver = { 1083static struct isa_driver snd_opti9xx_driver = {
1084 .match = snd_opti9xx_isa_match, 1084 .match = snd_opti9xx_isa_match,
1085 .probe = snd_opti9xx_isa_probe, 1085 .probe = snd_opti9xx_isa_probe,
1086 .remove = __devexit_p(snd_opti9xx_isa_remove), 1086 .remove = snd_opti9xx_isa_remove,
1087#ifdef CONFIG_PM 1087#ifdef CONFIG_PM
1088 .suspend = snd_opti9xx_isa_suspend, 1088 .suspend = snd_opti9xx_isa_suspend,
1089 .resume = snd_opti9xx_isa_resume, 1089 .resume = snd_opti9xx_isa_resume,
@@ -1094,8 +1094,8 @@ static struct isa_driver snd_opti9xx_driver = {
1094}; 1094};
1095 1095
1096#ifdef CONFIG_PNP 1096#ifdef CONFIG_PNP
1097static int __devinit snd_opti9xx_pnp_probe(struct pnp_card_link *pcard, 1097static int snd_opti9xx_pnp_probe(struct pnp_card_link *pcard,
1098 const struct pnp_card_device_id *pid) 1098 const struct pnp_card_device_id *pid)
1099{ 1099{
1100 struct snd_card *card; 1100 struct snd_card *card;
1101 int error, hw; 1101 int error, hw;
@@ -1146,7 +1146,7 @@ static int __devinit snd_opti9xx_pnp_probe(struct pnp_card_link *pcard,
1146 return 0; 1146 return 0;
1147} 1147}
1148 1148
1149static void __devexit snd_opti9xx_pnp_remove(struct pnp_card_link * pcard) 1149static void snd_opti9xx_pnp_remove(struct pnp_card_link *pcard)
1150{ 1150{
1151 snd_card_free(pnp_get_card_drvdata(pcard)); 1151 snd_card_free(pnp_get_card_drvdata(pcard));
1152 pnp_set_card_drvdata(pcard, NULL); 1152 pnp_set_card_drvdata(pcard, NULL);
@@ -1171,7 +1171,7 @@ static struct pnp_card_driver opti9xx_pnpc_driver = {
1171 .name = "opti9xx", 1171 .name = "opti9xx",
1172 .id_table = snd_opti9xx_pnpids, 1172 .id_table = snd_opti9xx_pnpids,
1173 .probe = snd_opti9xx_pnp_probe, 1173 .probe = snd_opti9xx_pnp_probe,
1174 .remove = __devexit_p(snd_opti9xx_pnp_remove), 1174 .remove = snd_opti9xx_pnp_remove,
1175#ifdef CONFIG_PM 1175#ifdef CONFIG_PM
1176 .suspend = snd_opti9xx_pnp_suspend, 1176 .suspend = snd_opti9xx_pnp_suspend,
1177 .resume = snd_opti9xx_pnp_resume, 1177 .resume = snd_opti9xx_pnp_resume,
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c
index 2aae6a0efbc..1d8a0364b9f 100644
--- a/sound/isa/sb/emu8000.c
+++ b/sound/isa/sb/emu8000.c
@@ -131,7 +131,7 @@ snd_emu8000_dma_chan(struct snd_emu8000 *emu, int ch, int mode)
131 131
132/* 132/*
133 */ 133 */
134static void __devinit 134static void
135snd_emu8000_read_wait(struct snd_emu8000 *emu) 135snd_emu8000_read_wait(struct snd_emu8000 *emu)
136{ 136{
137 while ((EMU8000_SMALR_READ(emu) & 0x80000000) != 0) { 137 while ((EMU8000_SMALR_READ(emu) & 0x80000000) != 0) {
@@ -143,7 +143,7 @@ snd_emu8000_read_wait(struct snd_emu8000 *emu)
143 143
144/* 144/*
145 */ 145 */
146static void __devinit 146static void
147snd_emu8000_write_wait(struct snd_emu8000 *emu) 147snd_emu8000_write_wait(struct snd_emu8000 *emu)
148{ 148{
149 while ((EMU8000_SMALW_READ(emu) & 0x80000000) != 0) { 149 while ((EMU8000_SMALW_READ(emu) & 0x80000000) != 0) {
@@ -156,7 +156,7 @@ snd_emu8000_write_wait(struct snd_emu8000 *emu)
156/* 156/*
157 * detect a card at the given port 157 * detect a card at the given port
158 */ 158 */
159static int __devinit 159static int
160snd_emu8000_detect(struct snd_emu8000 *emu) 160snd_emu8000_detect(struct snd_emu8000 *emu)
161{ 161{
162 /* Initialise */ 162 /* Initialise */
@@ -182,7 +182,7 @@ snd_emu8000_detect(struct snd_emu8000 *emu)
182/* 182/*
183 * intiailize audio channels 183 * intiailize audio channels
184 */ 184 */
185static void __devinit 185static void
186init_audio(struct snd_emu8000 *emu) 186init_audio(struct snd_emu8000 *emu)
187{ 187{
188 int ch; 188 int ch;
@@ -223,7 +223,7 @@ init_audio(struct snd_emu8000 *emu)
223/* 223/*
224 * initialize DMA address 224 * initialize DMA address
225 */ 225 */
226static void __devinit 226static void
227init_dma(struct snd_emu8000 *emu) 227init_dma(struct snd_emu8000 *emu)
228{ 228{
229 EMU8000_SMALR_WRITE(emu, 0); 229 EMU8000_SMALR_WRITE(emu, 0);
@@ -327,7 +327,7 @@ static unsigned short init4[128] /*__devinitdata*/ = {
327 * Taken from the oss driver, not obvious from the doc how this 327 * Taken from the oss driver, not obvious from the doc how this
328 * is meant to work 328 * is meant to work
329 */ 329 */
330static void __devinit 330static void
331send_array(struct snd_emu8000 *emu, unsigned short *data, int size) 331send_array(struct snd_emu8000 *emu, unsigned short *data, int size)
332{ 332{
333 int i; 333 int i;
@@ -349,7 +349,7 @@ send_array(struct snd_emu8000 *emu, unsigned short *data, int size)
349 * Send initialization arrays to start up, this just follows the 349 * Send initialization arrays to start up, this just follows the
350 * initialisation sequence in the adip. 350 * initialisation sequence in the adip.
351 */ 351 */
352static void __devinit 352static void
353init_arrays(struct snd_emu8000 *emu) 353init_arrays(struct snd_emu8000 *emu)
354{ 354{
355 send_array(emu, init1, ARRAY_SIZE(init1)/4); 355 send_array(emu, init1, ARRAY_SIZE(init1)/4);
@@ -375,7 +375,7 @@ init_arrays(struct snd_emu8000 *emu)
375 * seems that the only way to do this is to use the one channel and keep 375 * seems that the only way to do this is to use the one channel and keep
376 * reallocating between read and write. 376 * reallocating between read and write.
377 */ 377 */
378static void __devinit 378static void
379size_dram(struct snd_emu8000 *emu) 379size_dram(struct snd_emu8000 *emu)
380{ 380{
381 int i, size, detected_size; 381 int i, size, detected_size;
@@ -512,7 +512,7 @@ snd_emu8000_init_fm(struct snd_emu8000 *emu)
512/* 512/*
513 * The main initialization routine. 513 * The main initialization routine.
514 */ 514 */
515static void __devinit 515static void
516snd_emu8000_init_hw(struct snd_emu8000 *emu) 516snd_emu8000_init_hw(struct snd_emu8000 *emu)
517{ 517{
518 int i; 518 int i;
@@ -1031,7 +1031,7 @@ static struct snd_kcontrol_new *mixer_defs[EMU8000_NUM_CONTROLS] = {
1031/* 1031/*
1032 * create and attach mixer elements for WaveTable treble/bass controls 1032 * create and attach mixer elements for WaveTable treble/bass controls
1033 */ 1033 */
1034static int __devinit 1034static int
1035snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu) 1035snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu)
1036{ 1036{
1037 int i, err = 0; 1037 int i, err = 0;
@@ -1082,7 +1082,7 @@ static int snd_emu8000_dev_free(struct snd_device *device)
1082/* 1082/*
1083 * initialize and register emu8000 synth device. 1083 * initialize and register emu8000 synth device.
1084 */ 1084 */
1085int __devinit 1085int
1086snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports, 1086snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports,
1087 struct snd_seq_device **awe_ret) 1087 struct snd_seq_device **awe_ret)
1088{ 1088{
diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c
index 410758c6809..4961da4e627 100644
--- a/sound/isa/sb/jazz16.c
+++ b/sound/isa/sb/jazz16.c
@@ -78,8 +78,8 @@ static irqreturn_t jazz16_interrupt(int irq, void *chip)
78 return snd_sb8dsp_interrupt(chip); 78 return snd_sb8dsp_interrupt(chip);
79} 79}
80 80
81static int __devinit jazz16_configure_ports(unsigned long port, 81static int jazz16_configure_ports(unsigned long port,
82 unsigned long mpu_port, int idx) 82 unsigned long mpu_port, int idx)
83{ 83{
84 unsigned char val; 84 unsigned char val;
85 85
@@ -99,8 +99,8 @@ static int __devinit jazz16_configure_ports(unsigned long port,
99 return 0; 99 return 0;
100} 100}
101 101
102static int __devinit jazz16_detect_board(unsigned long port, 102static int jazz16_detect_board(unsigned long port,
103 unsigned long mpu_port) 103 unsigned long mpu_port)
104{ 104{
105 int err; 105 int err;
106 int val; 106 int val;
@@ -156,7 +156,7 @@ err_unmap:
156 return err; 156 return err;
157} 157}
158 158
159static int __devinit jazz16_configure_board(struct snd_sb *chip, int mpu_irq) 159static int jazz16_configure_board(struct snd_sb *chip, int mpu_irq)
160{ 160{
161 static unsigned char jazz_irq_bits[] = { 0, 0, 2, 3, 0, 1, 0, 4, 161 static unsigned char jazz_irq_bits[] = { 0, 0, 2, 3, 0, 1, 0, 4,
162 0, 2, 5, 0, 0, 0, 0, 6 }; 162 0, 2, 5, 0, 0, 0, 0, 6 };
@@ -183,7 +183,7 @@ static int __devinit jazz16_configure_board(struct snd_sb *chip, int mpu_irq)
183 return 0; 183 return 0;
184} 184}
185 185
186static int __devinit snd_jazz16_match(struct device *devptr, unsigned int dev) 186static int snd_jazz16_match(struct device *devptr, unsigned int dev)
187{ 187{
188 if (!enable[dev]) 188 if (!enable[dev])
189 return 0; 189 return 0;
@@ -218,7 +218,7 @@ static int __devinit snd_jazz16_match(struct device *devptr, unsigned int dev)
218 return 1; 218 return 1;
219} 219}
220 220
221static int __devinit snd_jazz16_probe(struct device *devptr, unsigned int dev) 221static int snd_jazz16_probe(struct device *devptr, unsigned int dev)
222{ 222{
223 struct snd_card *card; 223 struct snd_card *card;
224 struct snd_card_jazz16 *jazz16; 224 struct snd_card_jazz16 *jazz16;
@@ -341,7 +341,7 @@ err_free:
341 return err; 341 return err;
342} 342}
343 343
344static int __devexit snd_jazz16_remove(struct device *devptr, unsigned int dev) 344static int snd_jazz16_remove(struct device *devptr, unsigned int dev)
345{ 345{
346 struct snd_card *card = dev_get_drvdata(devptr); 346 struct snd_card *card = dev_get_drvdata(devptr);
347 347
@@ -380,7 +380,7 @@ static int snd_jazz16_resume(struct device *pdev, unsigned int n)
380static struct isa_driver snd_jazz16_driver = { 380static struct isa_driver snd_jazz16_driver = {
381 .match = snd_jazz16_match, 381 .match = snd_jazz16_match,
382 .probe = snd_jazz16_probe, 382 .probe = snd_jazz16_probe,
383 .remove = __devexit_p(snd_jazz16_remove), 383 .remove = snd_jazz16_remove,
384#ifdef CONFIG_PM 384#ifdef CONFIG_PM
385 .suspend = snd_jazz16_suspend, 385 .suspend = snd_jazz16_suspend,
386 .resume = snd_jazz16_resume, 386 .resume = snd_jazz16_resume,
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 39b8eca1521..50dbec454f9 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -250,9 +250,9 @@ MODULE_DEVICE_TABLE(pnp_card, snd_sb16_pnpids);
250 250
251#ifdef CONFIG_PNP 251#ifdef CONFIG_PNP
252 252
253static int __devinit snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard, 253static int snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,
254 struct pnp_card_link *card, 254 struct pnp_card_link *card,
255 const struct pnp_card_device_id *id) 255 const struct pnp_card_device_id *id)
256{ 256{
257 struct pnp_dev *pdev; 257 struct pnp_dev *pdev;
258 int err; 258 int err;
@@ -337,7 +337,7 @@ static int snd_sb16_card_new(int dev, struct snd_card **cardp)
337 return 0; 337 return 0;
338} 338}
339 339
340static int __devinit snd_sb16_probe(struct snd_card *card, int dev) 340static int snd_sb16_probe(struct snd_card *card, int dev)
341{ 341{
342 int xirq, xdma8, xdma16; 342 int xirq, xdma8, xdma16;
343 struct snd_sb *chip; 343 struct snd_sb *chip;
@@ -487,7 +487,7 @@ static int snd_sb16_resume(struct snd_card *card)
487} 487}
488#endif 488#endif
489 489
490static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev) 490static int snd_sb16_isa_probe1(int dev, struct device *pdev)
491{ 491{
492 struct snd_card_sb16 *acard; 492 struct snd_card_sb16 *acard;
493 struct snd_card *card; 493 struct snd_card *card;
@@ -517,12 +517,12 @@ static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev)
517} 517}
518 518
519 519
520static int __devinit snd_sb16_isa_match(struct device *pdev, unsigned int dev) 520static int snd_sb16_isa_match(struct device *pdev, unsigned int dev)
521{ 521{
522 return enable[dev] && !is_isapnp_selected(dev); 522 return enable[dev] && !is_isapnp_selected(dev);
523} 523}
524 524
525static int __devinit snd_sb16_isa_probe(struct device *pdev, unsigned int dev) 525static int snd_sb16_isa_probe(struct device *pdev, unsigned int dev)
526{ 526{
527 int err; 527 int err;
528 static int possible_irqs[] = {5, 9, 10, 7, -1}; 528 static int possible_irqs[] = {5, 9, 10, 7, -1};
@@ -563,7 +563,7 @@ static int __devinit snd_sb16_isa_probe(struct device *pdev, unsigned int dev)
563 } 563 }
564} 564}
565 565
566static int __devexit snd_sb16_isa_remove(struct device *pdev, unsigned int dev) 566static int snd_sb16_isa_remove(struct device *pdev, unsigned int dev)
567{ 567{
568 snd_card_free(dev_get_drvdata(pdev)); 568 snd_card_free(dev_get_drvdata(pdev));
569 dev_set_drvdata(pdev, NULL); 569 dev_set_drvdata(pdev, NULL);
@@ -592,7 +592,7 @@ static int snd_sb16_isa_resume(struct device *dev, unsigned int n)
592static struct isa_driver snd_sb16_isa_driver = { 592static struct isa_driver snd_sb16_isa_driver = {
593 .match = snd_sb16_isa_match, 593 .match = snd_sb16_isa_match,
594 .probe = snd_sb16_isa_probe, 594 .probe = snd_sb16_isa_probe,
595 .remove = __devexit_p(snd_sb16_isa_remove), 595 .remove = snd_sb16_isa_remove,
596#ifdef CONFIG_PM 596#ifdef CONFIG_PM
597 .suspend = snd_sb16_isa_suspend, 597 .suspend = snd_sb16_isa_suspend,
598 .resume = snd_sb16_isa_resume, 598 .resume = snd_sb16_isa_resume,
@@ -604,8 +604,8 @@ static struct isa_driver snd_sb16_isa_driver = {
604 604
605 605
606#ifdef CONFIG_PNP 606#ifdef CONFIG_PNP
607static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard, 607static int snd_sb16_pnp_detect(struct pnp_card_link *pcard,
608 const struct pnp_card_device_id *pid) 608 const struct pnp_card_device_id *pid)
609{ 609{
610 static int dev; 610 static int dev;
611 struct snd_card *card; 611 struct snd_card *card;
@@ -631,7 +631,7 @@ static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard,
631 return -ENODEV; 631 return -ENODEV;
632} 632}
633 633
634static void __devexit snd_sb16_pnp_remove(struct pnp_card_link * pcard) 634static void snd_sb16_pnp_remove(struct pnp_card_link *pcard)
635{ 635{
636 snd_card_free(pnp_get_card_drvdata(pcard)); 636 snd_card_free(pnp_get_card_drvdata(pcard));
637 pnp_set_card_drvdata(pcard, NULL); 637 pnp_set_card_drvdata(pcard, NULL);
@@ -657,7 +657,7 @@ static struct pnp_card_driver sb16_pnpc_driver = {
657#endif 657#endif
658 .id_table = snd_sb16_pnpids, 658 .id_table = snd_sb16_pnpids,
659 .probe = snd_sb16_pnp_detect, 659 .probe = snd_sb16_pnp_detect,
660 .remove = __devexit_p(snd_sb16_pnp_remove), 660 .remove = snd_sb16_pnp_remove,
661#ifdef CONFIG_PM 661#ifdef CONFIG_PM
662 .suspend = snd_sb16_pnp_suspend, 662 .suspend = snd_sb16_pnp_suspend,
663 .resume = snd_sb16_pnp_resume, 663 .resume = snd_sb16_pnp_resume,
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index ab5cebea52e..237d964ff8a 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -79,7 +79,7 @@ static void snd_sb8_free(struct snd_card *card)
79 release_and_free_resource(acard->fm_res); 79 release_and_free_resource(acard->fm_res);
80} 80}
81 81
82static int __devinit snd_sb8_match(struct device *pdev, unsigned int dev) 82static int snd_sb8_match(struct device *pdev, unsigned int dev)
83{ 83{
84 if (!enable[dev]) 84 if (!enable[dev])
85 return 0; 85 return 0;
@@ -94,7 +94,7 @@ static int __devinit snd_sb8_match(struct device *pdev, unsigned int dev)
94 return 1; 94 return 1;
95} 95}
96 96
97static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev) 97static int snd_sb8_probe(struct device *pdev, unsigned int dev)
98{ 98{
99 struct snd_sb *chip; 99 struct snd_sb *chip;
100 struct snd_card *card; 100 struct snd_card *card;
@@ -205,7 +205,7 @@ static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev)
205 return err; 205 return err;
206} 206}
207 207
208static int __devexit snd_sb8_remove(struct device *pdev, unsigned int dev) 208static int snd_sb8_remove(struct device *pdev, unsigned int dev)
209{ 209{
210 snd_card_free(dev_get_drvdata(pdev)); 210 snd_card_free(dev_get_drvdata(pdev));
211 dev_set_drvdata(pdev, NULL); 211 dev_set_drvdata(pdev, NULL);
@@ -244,7 +244,7 @@ static int snd_sb8_resume(struct device *dev, unsigned int n)
244static struct isa_driver snd_sb8_driver = { 244static struct isa_driver snd_sb8_driver = {
245 .match = snd_sb8_match, 245 .match = snd_sb8_match,
246 .probe = snd_sb8_probe, 246 .probe = snd_sb8_probe,
247 .remove = __devexit_p(snd_sb8_remove), 247 .remove = snd_sb8_remove,
248#ifdef CONFIG_PM 248#ifdef CONFIG_PM
249 .suspend = snd_sb8_suspend, 249 .suspend = snd_sb8_suspend,
250 .resume = snd_sb8_resume, 250 .resume = snd_sb8_resume,
diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c
index d97d0f38181..5376ebff845 100644
--- a/sound/isa/sc6000.c
+++ b/sound/isa/sc6000.c
@@ -121,7 +121,7 @@ MODULE_PARM_DESC(joystick, "Enable gameport.");
121/* 121/*
122 * sc6000_irq_to_softcfg - Decode irq number into cfg code. 122 * sc6000_irq_to_softcfg - Decode irq number into cfg code.
123 */ 123 */
124static __devinit unsigned char sc6000_irq_to_softcfg(int irq) 124static unsigned char sc6000_irq_to_softcfg(int irq)
125{ 125{
126 unsigned char val = 0; 126 unsigned char val = 0;
127 127
@@ -150,7 +150,7 @@ static __devinit unsigned char sc6000_irq_to_softcfg(int irq)
150/* 150/*
151 * sc6000_dma_to_softcfg - Decode dma number into cfg code. 151 * sc6000_dma_to_softcfg - Decode dma number into cfg code.
152 */ 152 */
153static __devinit unsigned char sc6000_dma_to_softcfg(int dma) 153static unsigned char sc6000_dma_to_softcfg(int dma)
154{ 154{
155 unsigned char val = 0; 155 unsigned char val = 0;
156 156
@@ -173,7 +173,7 @@ static __devinit unsigned char sc6000_dma_to_softcfg(int dma)
173/* 173/*
174 * sc6000_mpu_irq_to_softcfg - Decode MPU-401 irq number into cfg code. 174 * sc6000_mpu_irq_to_softcfg - Decode MPU-401 irq number into cfg code.
175 */ 175 */
176static __devinit unsigned char sc6000_mpu_irq_to_softcfg(int mpu_irq) 176static unsigned char sc6000_mpu_irq_to_softcfg(int mpu_irq)
177{ 177{
178 unsigned char val = 0; 178 unsigned char val = 0;
179 179
@@ -242,8 +242,8 @@ static int sc6000_write(char __iomem *vport, int cmd)
242 return -EIO; 242 return -EIO;
243} 243}
244 244
245static int __devinit sc6000_dsp_get_answer(char __iomem *vport, int command, 245static int sc6000_dsp_get_answer(char __iomem *vport, int command,
246 char *data, int data_len) 246 char *data, int data_len)
247{ 247{
248 int len = 0; 248 int len = 0;
249 249
@@ -269,7 +269,7 @@ static int __devinit sc6000_dsp_get_answer(char __iomem *vport, int command,
269 return len ? len : -EIO; 269 return len ? len : -EIO;
270} 270}
271 271
272static int __devinit sc6000_dsp_reset(char __iomem *vport) 272static int sc6000_dsp_reset(char __iomem *vport)
273{ 273{
274 iowrite8(1, vport + DSP_RESET); 274 iowrite8(1, vport + DSP_RESET);
275 udelay(10); 275 udelay(10);
@@ -281,7 +281,7 @@ static int __devinit sc6000_dsp_reset(char __iomem *vport)
281} 281}
282 282
283/* detection and initialization */ 283/* detection and initialization */
284static int __devinit sc6000_hw_cfg_write(char __iomem *vport, const int *cfg) 284static int sc6000_hw_cfg_write(char __iomem *vport, const int *cfg)
285{ 285{
286 if (sc6000_write(vport, COMMAND_6C) < 0) { 286 if (sc6000_write(vport, COMMAND_6C) < 0) {
287 snd_printk(KERN_WARNING "CMD 0x%x: failed!\n", COMMAND_6C); 287 snd_printk(KERN_WARNING "CMD 0x%x: failed!\n", COMMAND_6C);
@@ -345,8 +345,8 @@ static int sc6000_setup_board(char __iomem *vport, int config)
345 return 0; 345 return 0;
346} 346}
347 347
348static int __devinit sc6000_init_mss(char __iomem *vport, int config, 348static int sc6000_init_mss(char __iomem *vport, int config,
349 char __iomem *vmss_port, int mss_config) 349 char __iomem *vmss_port, int mss_config)
350{ 350{
351 if (sc6000_write(vport, DSP_INIT_MSS)) { 351 if (sc6000_write(vport, DSP_INIT_MSS)) {
352 snd_printk(KERN_ERR "sc6000_init_mss [0x%x]: failed!\n", 352 snd_printk(KERN_ERR "sc6000_init_mss [0x%x]: failed!\n",
@@ -364,9 +364,9 @@ static int __devinit sc6000_init_mss(char __iomem *vport, int config,
364 return 0; 364 return 0;
365} 365}
366 366
367static void __devinit sc6000_hw_cfg_encode(char __iomem *vport, int *cfg, 367static void sc6000_hw_cfg_encode(char __iomem *vport, int *cfg,
368 long xport, long xmpu, 368 long xport, long xmpu,
369 long xmss_port, int joystick) 369 long xmss_port, int joystick)
370{ 370{
371 cfg[0] = 0; 371 cfg[0] = 0;
372 cfg[1] = 0; 372 cfg[1] = 0;
@@ -386,8 +386,8 @@ static void __devinit sc6000_hw_cfg_encode(char __iomem *vport, int *cfg,
386 snd_printd("hw cfg %x, %x\n", cfg[0], cfg[1]); 386 snd_printd("hw cfg %x, %x\n", cfg[0], cfg[1]);
387} 387}
388 388
389static int __devinit sc6000_init_board(char __iomem *vport, 389static int sc6000_init_board(char __iomem *vport,
390 char __iomem *vmss_port, int dev) 390 char __iomem *vmss_port, int dev)
391{ 391{
392 char answer[15]; 392 char answer[15];
393 char version[2]; 393 char version[2];
@@ -467,7 +467,7 @@ static int __devinit sc6000_init_board(char __iomem *vport,
467 return 0; 467 return 0;
468} 468}
469 469
470static int __devinit snd_sc6000_mixer(struct snd_wss *chip) 470static int snd_sc6000_mixer(struct snd_wss *chip)
471{ 471{
472 struct snd_card *card = chip->card; 472 struct snd_card *card = chip->card;
473 struct snd_ctl_elem_id id1, id2; 473 struct snd_ctl_elem_id id1, id2;
@@ -502,7 +502,7 @@ static int __devinit snd_sc6000_mixer(struct snd_wss *chip)
502 return 0; 502 return 0;
503} 503}
504 504
505static int __devinit snd_sc6000_match(struct device *devptr, unsigned int dev) 505static int snd_sc6000_match(struct device *devptr, unsigned int dev)
506{ 506{
507 if (!enable[dev]) 507 if (!enable[dev])
508 return 0; 508 return 0;
@@ -545,7 +545,7 @@ static int __devinit snd_sc6000_match(struct device *devptr, unsigned int dev)
545 return 1; 545 return 1;
546} 546}
547 547
548static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev) 548static int snd_sc6000_probe(struct device *devptr, unsigned int dev)
549{ 549{
550 static int possible_irqs[] = { 5, 7, 9, 10, 11, -1 }; 550 static int possible_irqs[] = { 5, 7, 9, 10, 11, -1 };
551 static int possible_dmas[] = { 1, 3, 0, -1 }; 551 static int possible_dmas[] = { 1, 3, 0, -1 };
@@ -687,7 +687,7 @@ err_exit:
687 return err; 687 return err;
688} 688}
689 689
690static int __devexit snd_sc6000_remove(struct device *devptr, unsigned int dev) 690static int snd_sc6000_remove(struct device *devptr, unsigned int dev)
691{ 691{
692 struct snd_card *card = dev_get_drvdata(devptr); 692 struct snd_card *card = dev_get_drvdata(devptr);
693 char __iomem **vport = card->private_data; 693 char __iomem **vport = card->private_data;
@@ -706,7 +706,7 @@ static int __devexit snd_sc6000_remove(struct device *devptr, unsigned int dev)
706static struct isa_driver snd_sc6000_driver = { 706static struct isa_driver snd_sc6000_driver = {
707 .match = snd_sc6000_match, 707 .match = snd_sc6000_match,
708 .probe = snd_sc6000_probe, 708 .probe = snd_sc6000_probe,
709 .remove = __devexit_p(snd_sc6000_remove), 709 .remove = snd_sc6000_remove,
710 /* FIXME: suspend/resume */ 710 /* FIXME: suspend/resume */
711 .driver = { 711 .driver = {
712 .name = DRV_NAME, 712 .name = DRV_NAME,
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 8490f59709b..42a009720b2 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -683,7 +683,7 @@ static struct snd_kcontrol_new midi_mixer_ctl = {
683 * These IRQs are encoded as bit patterns so that they can be 683 * These IRQs are encoded as bit patterns so that they can be
684 * written to the control registers. 684 * written to the control registers.
685 */ 685 */
686static unsigned __devinit get_irq_config(int sscape_type, int irq) 686static unsigned get_irq_config(int sscape_type, int irq)
687{ 687{
688 static const int valid_irq[] = { 9, 5, 7, 10 }; 688 static const int valid_irq[] = { 9, 5, 7, 10 };
689 static const int old_irq[] = { 9, 7, 5, 15 }; 689 static const int old_irq[] = { 9, 7, 5, 15 };
@@ -706,7 +706,7 @@ static unsigned __devinit get_irq_config(int sscape_type, int irq)
706 * Perform certain arcane port-checks to see whether there 706 * Perform certain arcane port-checks to see whether there
707 * is a SoundScape board lurking behind the given ports. 707 * is a SoundScape board lurking behind the given ports.
708 */ 708 */
709static int __devinit detect_sscape(struct soundscape *s, long wss_io) 709static int detect_sscape(struct soundscape *s, long wss_io)
710{ 710{
711 unsigned long flags; 711 unsigned long flags;
712 unsigned d; 712 unsigned d;
@@ -817,8 +817,8 @@ static int mpu401_open(struct snd_mpu401 *mpu)
817/* 817/*
818 * Initialse an MPU-401 subdevice for MIDI support on the SoundScape. 818 * Initialse an MPU-401 subdevice for MIDI support on the SoundScape.
819 */ 819 */
820static int __devinit create_mpu401(struct snd_card *card, int devnum, 820static int create_mpu401(struct snd_card *card, int devnum,
821 unsigned long port, int irq) 821 unsigned long port, int irq)
822{ 822{
823 struct soundscape *sscape = get_card_soundscape(card); 823 struct soundscape *sscape = get_card_soundscape(card);
824 struct snd_rawmidi *rawmidi; 824 struct snd_rawmidi *rawmidi;
@@ -845,8 +845,8 @@ static int __devinit create_mpu401(struct snd_card *card, int devnum,
845 * try to support at least some of the extra bits by overriding 845 * try to support at least some of the extra bits by overriding
846 * some of the CS4231 callback. 846 * some of the CS4231 callback.
847 */ 847 */
848static int __devinit create_ad1845(struct snd_card *card, unsigned port, 848static int create_ad1845(struct snd_card *card, unsigned port,
849 int irq, int dma1, int dma2) 849 int irq, int dma1, int dma2)
850{ 850{
851 register struct soundscape *sscape = get_card_soundscape(card); 851 register struct soundscape *sscape = get_card_soundscape(card);
852 struct snd_wss *chip; 852 struct snd_wss *chip;
@@ -937,7 +937,7 @@ _error:
937 * Create an ALSA soundcard entry for the SoundScape, using 937 * Create an ALSA soundcard entry for the SoundScape, using
938 * the given list of port, IRQ and DMA resources. 938 * the given list of port, IRQ and DMA resources.
939 */ 939 */
940static int __devinit create_sscape(int dev, struct snd_card *card) 940static int create_sscape(int dev, struct snd_card *card)
941{ 941{
942 struct soundscape *sscape = get_card_soundscape(card); 942 struct soundscape *sscape = get_card_soundscape(card);
943 unsigned dma_cfg; 943 unsigned dma_cfg;
@@ -1143,7 +1143,7 @@ _release_region:
1143} 1143}
1144 1144
1145 1145
1146static int __devinit snd_sscape_match(struct device *pdev, unsigned int i) 1146static int snd_sscape_match(struct device *pdev, unsigned int i)
1147{ 1147{
1148 /* 1148 /*
1149 * Make sure we were given ALL of the other parameters. 1149 * Make sure we were given ALL of the other parameters.
@@ -1163,7 +1163,7 @@ static int __devinit snd_sscape_match(struct device *pdev, unsigned int i)
1163 return 1; 1163 return 1;
1164} 1164}
1165 1165
1166static int __devinit snd_sscape_probe(struct device *pdev, unsigned int dev) 1166static int snd_sscape_probe(struct device *pdev, unsigned int dev)
1167{ 1167{
1168 struct snd_card *card; 1168 struct snd_card *card;
1169 struct soundscape *sscape; 1169 struct soundscape *sscape;
@@ -1197,7 +1197,7 @@ _release_card:
1197 return ret; 1197 return ret;
1198} 1198}
1199 1199
1200static int __devexit snd_sscape_remove(struct device *devptr, unsigned int dev) 1200static int snd_sscape_remove(struct device *devptr, unsigned int dev)
1201{ 1201{
1202 snd_card_free(dev_get_drvdata(devptr)); 1202 snd_card_free(dev_get_drvdata(devptr));
1203 dev_set_drvdata(devptr, NULL); 1203 dev_set_drvdata(devptr, NULL);
@@ -1209,7 +1209,7 @@ static int __devexit snd_sscape_remove(struct device *devptr, unsigned int dev)
1209static struct isa_driver snd_sscape_driver = { 1209static struct isa_driver snd_sscape_driver = {
1210 .match = snd_sscape_match, 1210 .match = snd_sscape_match,
1211 .probe = snd_sscape_probe, 1211 .probe = snd_sscape_probe,
1212 .remove = __devexit_p(snd_sscape_remove), 1212 .remove = snd_sscape_remove,
1213 /* FIXME: suspend/resume */ 1213 /* FIXME: suspend/resume */
1214 .driver = { 1214 .driver = {
1215 .name = DEV_NAME 1215 .name = DEV_NAME
@@ -1217,7 +1217,7 @@ static struct isa_driver snd_sscape_driver = {
1217}; 1217};
1218 1218
1219#ifdef CONFIG_PNP 1219#ifdef CONFIG_PNP
1220static inline int __devinit get_next_autoindex(int i) 1220static inline int get_next_autoindex(int i)
1221{ 1221{
1222 while (i < SNDRV_CARDS && port[i] != SNDRV_AUTO_PORT) 1222 while (i < SNDRV_CARDS && port[i] != SNDRV_AUTO_PORT)
1223 ++i; 1223 ++i;
@@ -1225,8 +1225,8 @@ static inline int __devinit get_next_autoindex(int i)
1225} 1225}
1226 1226
1227 1227
1228static int __devinit sscape_pnp_detect(struct pnp_card_link *pcard, 1228static int sscape_pnp_detect(struct pnp_card_link *pcard,
1229 const struct pnp_card_device_id *pid) 1229 const struct pnp_card_device_id *pid)
1230{ 1230{
1231 static int idx = 0; 1231 static int idx = 0;
1232 struct pnp_dev *dev; 1232 struct pnp_dev *dev;
@@ -1310,7 +1310,7 @@ _release_card:
1310 return ret; 1310 return ret;
1311} 1311}
1312 1312
1313static void __devexit sscape_pnp_remove(struct pnp_card_link * pcard) 1313static void sscape_pnp_remove(struct pnp_card_link *pcard)
1314{ 1314{
1315 snd_card_free(pnp_get_card_drvdata(pcard)); 1315 snd_card_free(pnp_get_card_drvdata(pcard));
1316 pnp_set_card_drvdata(pcard, NULL); 1316 pnp_set_card_drvdata(pcard, NULL);
@@ -1321,7 +1321,7 @@ static struct pnp_card_driver sscape_pnpc_driver = {
1321 .name = "sscape", 1321 .name = "sscape",
1322 .id_table = sscape_pnpids, 1322 .id_table = sscape_pnpids,
1323 .probe = sscape_pnp_detect, 1323 .probe = sscape_pnp_detect,
1324 .remove = __devexit_p(sscape_pnp_remove), 1324 .remove = sscape_pnp_remove,
1325}; 1325};
1326 1326
1327#endif /* CONFIG_PNP */ 1327#endif /* CONFIG_PNP */
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index e0a73271cb9..fe5dd982bd2 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -98,7 +98,7 @@ static struct pnp_card_device_id snd_wavefront_pnpids[] = {
98 98
99MODULE_DEVICE_TABLE(pnp_card, snd_wavefront_pnpids); 99MODULE_DEVICE_TABLE(pnp_card, snd_wavefront_pnpids);
100 100
101static int __devinit 101static int
102snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *card, 102snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *card,
103 const struct pnp_card_device_id *id) 103 const struct pnp_card_device_id *id)
104{ 104{
@@ -231,10 +231,9 @@ static irqreturn_t snd_wavefront_ics2115_interrupt(int irq, void *dev_id)
231 return IRQ_HANDLED; 231 return IRQ_HANDLED;
232} 232}
233 233
234static struct snd_hwdep * __devinit 234static struct snd_hwdep *snd_wavefront_new_synth(struct snd_card *card,
235snd_wavefront_new_synth (struct snd_card *card, 235 int hw_dev,
236 int hw_dev, 236 snd_wavefront_card_t *acard)
237 snd_wavefront_card_t *acard)
238{ 237{
239 struct snd_hwdep *wavefront_synth; 238 struct snd_hwdep *wavefront_synth;
240 239
@@ -257,11 +256,10 @@ snd_wavefront_new_synth (struct snd_card *card,
257 return wavefront_synth; 256 return wavefront_synth;
258} 257}
259 258
260static struct snd_hwdep * __devinit 259static struct snd_hwdep *snd_wavefront_new_fx(struct snd_card *card,
261snd_wavefront_new_fx (struct snd_card *card, 260 int hw_dev,
262 int hw_dev, 261 snd_wavefront_card_t *acard,
263 snd_wavefront_card_t *acard, 262 unsigned long port)
264 unsigned long port)
265 263
266{ 264{
267 struct snd_hwdep *fx_processor; 265 struct snd_hwdep *fx_processor;
@@ -284,12 +282,11 @@ snd_wavefront_new_fx (struct snd_card *card,
284static snd_wavefront_mpu_id internal_id = internal_mpu; 282static snd_wavefront_mpu_id internal_id = internal_mpu;
285static snd_wavefront_mpu_id external_id = external_mpu; 283static snd_wavefront_mpu_id external_id = external_mpu;
286 284
287static struct snd_rawmidi *__devinit 285static struct snd_rawmidi *snd_wavefront_new_midi(struct snd_card *card,
288snd_wavefront_new_midi (struct snd_card *card, 286 int midi_dev,
289 int midi_dev, 287 snd_wavefront_card_t *acard,
290 snd_wavefront_card_t *acard, 288 unsigned long port,
291 unsigned long port, 289 snd_wavefront_mpu_id mpu)
292 snd_wavefront_mpu_id mpu)
293 290
294{ 291{
295 struct snd_rawmidi *rmidi; 292 struct snd_rawmidi *rmidi;
@@ -361,7 +358,7 @@ static int snd_wavefront_card_new(int dev, struct snd_card **cardp)
361 return 0; 358 return 0;
362} 359}
363 360
364static int __devinit 361static int
365snd_wavefront_probe (struct snd_card *card, int dev) 362snd_wavefront_probe (struct snd_card *card, int dev)
366{ 363{
367 snd_wavefront_card_t *acard = card->private_data; 364 snd_wavefront_card_t *acard = card->private_data;
@@ -541,8 +538,8 @@ snd_wavefront_probe (struct snd_card *card, int dev)
541 return snd_card_register(card); 538 return snd_card_register(card);
542} 539}
543 540
544static int __devinit snd_wavefront_isa_match(struct device *pdev, 541static int snd_wavefront_isa_match(struct device *pdev,
545 unsigned int dev) 542 unsigned int dev)
546{ 543{
547 if (!enable[dev]) 544 if (!enable[dev])
548 return 0; 545 return 0;
@@ -561,8 +558,8 @@ static int __devinit snd_wavefront_isa_match(struct device *pdev,
561 return 1; 558 return 1;
562} 559}
563 560
564static int __devinit snd_wavefront_isa_probe(struct device *pdev, 561static int snd_wavefront_isa_probe(struct device *pdev,
565 unsigned int dev) 562 unsigned int dev)
566{ 563{
567 struct snd_card *card; 564 struct snd_card *card;
568 int err; 565 int err;
@@ -580,8 +577,8 @@ static int __devinit snd_wavefront_isa_probe(struct device *pdev,
580 return 0; 577 return 0;
581} 578}
582 579
583static int __devexit snd_wavefront_isa_remove(struct device *devptr, 580static int snd_wavefront_isa_remove(struct device *devptr,
584 unsigned int dev) 581 unsigned int dev)
585{ 582{
586 snd_card_free(dev_get_drvdata(devptr)); 583 snd_card_free(dev_get_drvdata(devptr));
587 dev_set_drvdata(devptr, NULL); 584 dev_set_drvdata(devptr, NULL);
@@ -593,7 +590,7 @@ static int __devexit snd_wavefront_isa_remove(struct device *devptr,
593static struct isa_driver snd_wavefront_driver = { 590static struct isa_driver snd_wavefront_driver = {
594 .match = snd_wavefront_isa_match, 591 .match = snd_wavefront_isa_match,
595 .probe = snd_wavefront_isa_probe, 592 .probe = snd_wavefront_isa_probe,
596 .remove = __devexit_p(snd_wavefront_isa_remove), 593 .remove = snd_wavefront_isa_remove,
597 /* FIXME: suspend, resume */ 594 /* FIXME: suspend, resume */
598 .driver = { 595 .driver = {
599 .name = DEV_NAME 596 .name = DEV_NAME
@@ -602,8 +599,8 @@ static struct isa_driver snd_wavefront_driver = {
602 599
603 600
604#ifdef CONFIG_PNP 601#ifdef CONFIG_PNP
605static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard, 602static int snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
606 const struct pnp_card_device_id *pid) 603 const struct pnp_card_device_id *pid)
607{ 604{
608 static int dev; 605 static int dev;
609 struct snd_card *card; 606 struct snd_card *card;
@@ -637,7 +634,7 @@ static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
637 return 0; 634 return 0;
638} 635}
639 636
640static void __devexit snd_wavefront_pnp_remove(struct pnp_card_link * pcard) 637static void snd_wavefront_pnp_remove(struct pnp_card_link *pcard)
641{ 638{
642 snd_card_free(pnp_get_card_drvdata(pcard)); 639 snd_card_free(pnp_get_card_drvdata(pcard));
643 pnp_set_card_drvdata(pcard, NULL); 640 pnp_set_card_drvdata(pcard, NULL);
@@ -648,7 +645,7 @@ static struct pnp_card_driver wavefront_pnpc_driver = {
648 .name = "wavefront", 645 .name = "wavefront",
649 .id_table = snd_wavefront_pnpids, 646 .id_table = snd_wavefront_pnpids,
650 .probe = snd_wavefront_pnp_detect, 647 .probe = snd_wavefront_pnp_detect,
651 .remove = __devexit_p(snd_wavefront_pnp_remove), 648 .remove = snd_wavefront_pnp_remove,
652 /* FIXME: suspend,resume */ 649 /* FIXME: suspend,resume */
653}; 650};
654 651
diff --git a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c
index e51e0906050..b77883c7ee7 100644
--- a/sound/isa/wavefront/wavefront_fx.c
+++ b/sound/isa/wavefront/wavefront_fx.c
@@ -240,7 +240,7 @@ snd_wavefront_fx_ioctl (struct snd_hwdep *sdev, struct file *file,
240 that outputs it. 240 that outputs it.
241*/ 241*/
242 242
243int __devinit 243int
244snd_wavefront_fx_start (snd_wavefront_t *dev) 244snd_wavefront_fx_start (snd_wavefront_t *dev)
245{ 245{
246 unsigned int i; 246 unsigned int i;
diff --git a/sound/isa/wavefront/wavefront_midi.c b/sound/isa/wavefront/wavefront_midi.c
index 65329f3abc3..7dc99168229 100644
--- a/sound/isa/wavefront/wavefront_midi.c
+++ b/sound/isa/wavefront/wavefront_midi.c
@@ -481,7 +481,7 @@ snd_wavefront_midi_disable_virtual (snd_wavefront_card_t *card)
481 spin_unlock_irqrestore (&card->wavefront.midi.virtual, flags); 481 spin_unlock_irqrestore (&card->wavefront.midi.virtual, flags);
482} 482}
483 483
484int __devinit 484int
485snd_wavefront_midi_start (snd_wavefront_card_t *card) 485snd_wavefront_midi_start (snd_wavefront_card_t *card)
486 486
487{ 487{
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index b1bf8d4e649..a2f87f9488e 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -1739,7 +1739,7 @@ snd_wavefront_internal_interrupt (snd_wavefront_card_t *card)
17397 Unused 17397 Unused
1740*/ 1740*/
1741 1741
1742static int __devinit 1742static int
1743snd_wavefront_interrupt_bits (int irq) 1743snd_wavefront_interrupt_bits (int irq)
1744 1744
1745{ 1745{
@@ -1767,7 +1767,7 @@ snd_wavefront_interrupt_bits (int irq)
1767 return bits; 1767 return bits;
1768} 1768}
1769 1769
1770static void __devinit 1770static void
1771wavefront_should_cause_interrupt (snd_wavefront_t *dev, 1771wavefront_should_cause_interrupt (snd_wavefront_t *dev,
1772 int val, int port, unsigned long timeout) 1772 int val, int port, unsigned long timeout)
1773 1773
@@ -1786,7 +1786,7 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev,
1786 } 1786 }
1787} 1787}
1788 1788
1789static int __devinit 1789static int
1790wavefront_reset_to_cleanliness (snd_wavefront_t *dev) 1790wavefront_reset_to_cleanliness (snd_wavefront_t *dev)
1791 1791
1792{ 1792{
@@ -1937,7 +1937,7 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev)
1937 return (1); 1937 return (1);
1938} 1938}
1939 1939
1940static int __devinit 1940static int
1941wavefront_download_firmware (snd_wavefront_t *dev, char *path) 1941wavefront_download_firmware (snd_wavefront_t *dev, char *path)
1942 1942
1943{ 1943{
@@ -2010,7 +2010,7 @@ wavefront_download_firmware (snd_wavefront_t *dev, char *path)
2010} 2010}
2011 2011
2012 2012
2013static int __devinit 2013static int
2014wavefront_do_reset (snd_wavefront_t *dev) 2014wavefront_do_reset (snd_wavefront_t *dev)
2015 2015
2016{ 2016{
@@ -2099,7 +2099,7 @@ wavefront_do_reset (snd_wavefront_t *dev)
2099 return 1; 2099 return 1;
2100} 2100}
2101 2101
2102int __devinit 2102int
2103snd_wavefront_start (snd_wavefront_t *dev) 2103snd_wavefront_start (snd_wavefront_t *dev)
2104 2104
2105{ 2105{
@@ -2141,7 +2141,7 @@ snd_wavefront_start (snd_wavefront_t *dev)
2141 return (0); 2141 return (0);
2142} 2142}
2143 2143
2144int __devinit 2144int
2145snd_wavefront_detect (snd_wavefront_card_t *card) 2145snd_wavefront_detect (snd_wavefront_card_t *card)
2146 2146
2147{ 2147{
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-28 00:32:16 -0500