aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/isa/cmi8330.c4
-rw-r--r--sound/isa/cs423x/cs4236.c6
-rw-r--r--sound/isa/es18xx.c4
-rw-r--r--sound/isa/gus/gusmax.c4
-rw-r--r--sound/isa/opl3sa2.c4
-rw-r--r--sound/isa/opti9xx/miro.c6
-rw-r--r--sound/isa/opti9xx/opti92x-ad1848.c10
-rw-r--r--sound/isa/sb/sb16.c6
-rw-r--r--sound/isa/sb/sb8.c4
-rw-r--r--sound/isa/sgalaxy.c4
-rw-r--r--sound/isa/sscape.c4
-rw-r--r--sound/isa/wavefront/wavefront.c4
12 files changed, 30 insertions, 30 deletions
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index 456156de0791..214d65d94c45 100644
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -601,7 +601,7 @@ static int snd_cmi8330_isa_resume(struct device *dev, unsigned int n)
601} 601}
602#endif 602#endif
603 603
604#define CMI8330_DRIVER "snd_cmi8330" 604#define DEV_NAME "cmi8330"
605 605
606static struct isa_driver snd_cmi8330_driver = { 606static struct isa_driver snd_cmi8330_driver = {
607 .match = snd_cmi8330_isa_match, 607 .match = snd_cmi8330_isa_match,
@@ -612,7 +612,7 @@ static struct isa_driver snd_cmi8330_driver = {
612 .resume = snd_cmi8330_isa_resume, 612 .resume = snd_cmi8330_isa_resume,
613#endif 613#endif
614 .driver = { 614 .driver = {
615 .name = CMI8330_DRIVER 615 .name = DEV_NAME
616 }, 616 },
617}; 617};
618 618
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 7d9d4d562e90..87f1392a2fa7 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -75,10 +75,10 @@ MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4235},"
75 75
76#ifdef CS4232 76#ifdef CS4232
77#define IDENT "CS4232" 77#define IDENT "CS4232"
78#define CS423X_DRIVER "snd_cs4232" 78#define DEV_NAME "cs4232"
79#else 79#else
80#define IDENT "CS4236+" 80#define IDENT "CS4236+"
81#define CS423X_DRIVER "snd_cs4236" 81#define DEV_NAME "cs4236"
82#endif 82#endif
83 83
84static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ 84static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
@@ -630,7 +630,7 @@ static struct isa_driver cs423x_isa_driver = {
630 .resume = snd_cs423x_isa_resume, 630 .resume = snd_cs423x_isa_resume,
631#endif 631#endif
632 .driver = { 632 .driver = {
633 .name = CS423X_DRIVER 633 .name = DEV_NAME
634 }, 634 },
635}; 635};
636 636
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 12b61af1a4ef..d2a9c7df0ce5 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -2318,7 +2318,7 @@ static int snd_es18xx_isa_resume(struct device *dev, unsigned int n)
2318} 2318}
2319#endif 2319#endif
2320 2320
2321#define ES18XX_DRIVER "snd_es18xx" 2321#define DEV_NAME "es18xx"
2322 2322
2323static struct isa_driver snd_es18xx_isa_driver = { 2323static struct isa_driver snd_es18xx_isa_driver = {
2324 .match = snd_es18xx_isa_match, 2324 .match = snd_es18xx_isa_match,
@@ -2329,7 +2329,7 @@ static struct isa_driver snd_es18xx_isa_driver = {
2329 .resume = snd_es18xx_isa_resume, 2329 .resume = snd_es18xx_isa_resume,
2330#endif 2330#endif
2331 .driver = { 2331 .driver = {
2332 .name = ES18XX_DRIVER 2332 .name = DEV_NAME
2333 }, 2333 },
2334}; 2334};
2335 2335
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index a0d2f8fc2738..708783d4351f 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -358,7 +358,7 @@ static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev)
358 return 0; 358 return 0;
359} 359}
360 360
361#define GUSMAX_DRIVER "snd_gusmax" 361#define DEV_NAME "gusmax"
362 362
363static struct isa_driver snd_gusmax_driver = { 363static struct isa_driver snd_gusmax_driver = {
364 .match = snd_gusmax_match, 364 .match = snd_gusmax_match,
@@ -366,7 +366,7 @@ static struct isa_driver snd_gusmax_driver = {
366 .remove = __devexit_p(snd_gusmax_remove), 366 .remove = __devexit_p(snd_gusmax_remove),
367 /* FIXME: suspend/resume */ 367 /* FIXME: suspend/resume */
368 .driver = { 368 .driver = {
369 .name = GUSMAX_DRIVER 369 .name = DEV_NAME
370 }, 370 },
371}; 371};
372 372
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 50a812f1c804..48743eb85fb6 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -947,7 +947,7 @@ static int snd_opl3sa2_isa_resume(struct device *dev, unsigned int n)
947} 947}
948#endif 948#endif
949 949
950#define OPL3SA2_DRIVER "snd_opl3sa2" 950#define DEV_NAME "opl3sa2"
951 951
952static struct isa_driver snd_opl3sa2_isa_driver = { 952static struct isa_driver snd_opl3sa2_isa_driver = {
953 .match = snd_opl3sa2_isa_match, 953 .match = snd_opl3sa2_isa_match,
@@ -958,7 +958,7 @@ static struct isa_driver snd_opl3sa2_isa_driver = {
958 .resume = snd_opl3sa2_isa_resume, 958 .resume = snd_opl3sa2_isa_resume,
959#endif 959#endif
960 .driver = { 960 .driver = {
961 .name = OPL3SA2_DRIVER 961 .name = DEV_NAME
962 }, 962 },
963}; 963};
964 964
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index 33471bdbe269..cd29b30b362e 100644
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -137,8 +137,6 @@ struct snd_miro {
137 137
138static void snd_miro_proc_init(struct snd_miro * miro); 138static void snd_miro_proc_init(struct snd_miro * miro);
139 139
140#define DRIVER_NAME "snd-miro"
141
142static char * snd_opti9xx_names[] = { 140static char * snd_opti9xx_names[] = {
143 "unkown", 141 "unkown",
144 "82C928", "82C929", 142 "82C928", "82C929",
@@ -1423,13 +1421,15 @@ static int __devexit snd_miro_remove(struct device *devptr, unsigned int dev)
1423 return 0; 1421 return 0;
1424} 1422}
1425 1423
1424#define DEV_NAME "miro"
1425
1426static struct isa_driver snd_miro_driver = { 1426static struct isa_driver snd_miro_driver = {
1427 .match = snd_miro_match, 1427 .match = snd_miro_match,
1428 .probe = snd_miro_probe, 1428 .probe = snd_miro_probe,
1429 .remove = __devexit_p(snd_miro_remove), 1429 .remove = __devexit_p(snd_miro_remove),
1430 /* FIXME: suspend/resume */ 1430 /* FIXME: suspend/resume */
1431 .driver = { 1431 .driver = {
1432 .name = DRIVER_NAME 1432 .name = DEV_NAME
1433 }, 1433 },
1434}; 1434};
1435 1435
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 95d0ab124d5b..60c120ffb9de 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -280,10 +280,10 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids);
280#endif /* CONFIG_PNP */ 280#endif /* CONFIG_PNP */
281 281
282#ifdef OPTi93X 282#ifdef OPTi93X
283#define DRIVER_NAME "snd-card-opti93x" 283#define DEV_NAME "opti93x"
284#else 284#else
285#define DRIVER_NAME "snd-card-opti92x" 285#define DEV_NAME "opti92x"
286#endif /* OPTi93X */ 286#endif
287 287
288static char * snd_opti9xx_names[] = { 288static char * snd_opti9xx_names[] = {
289 "unkown", 289 "unkown",
@@ -1289,7 +1289,7 @@ static int snd_opti93x_create(struct snd_card *card, struct snd_opti9xx *chip,
1289 } 1289 }
1290 codec->dma2 = chip->dma2; 1290 codec->dma2 = chip->dma2;
1291 1291
1292 if (request_irq(chip->irq, snd_opti93x_interrupt, IRQF_DISABLED, DRIVER_NAME" - WSS", codec)) { 1292 if (request_irq(chip->irq, snd_opti93x_interrupt, IRQF_DISABLED, DEV_NAME" - WSS", codec)) {
1293 snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", chip->irq); 1293 snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", chip->irq);
1294 snd_opti93x_free(codec); 1294 snd_opti93x_free(codec);
1295 return -EBUSY; 1295 return -EBUSY;
@@ -2015,7 +2015,7 @@ static struct isa_driver snd_opti9xx_driver = {
2015 .remove = __devexit_p(snd_opti9xx_isa_remove), 2015 .remove = __devexit_p(snd_opti9xx_isa_remove),
2016 /* FIXME: suspend/resume */ 2016 /* FIXME: suspend/resume */
2017 .driver = { 2017 .driver = {
2018 .name = DRIVER_NAME 2018 .name = DEV_NAME
2019 }, 2019 },
2020}; 2020};
2021 2021
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 8b734a239008..2a19b0a39eda 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -615,9 +615,9 @@ static int snd_sb16_isa_resume(struct device *dev, unsigned int n)
615#endif 615#endif
616 616
617#ifdef SNDRV_SBAWE 617#ifdef SNDRV_SBAWE
618#define SND_SB16_DRIVER "snd_sbawe" 618#define DEV_NAME "sbawe"
619#else 619#else
620#define SND_SB16_DRIVER "snd_sb16" 620#define DEV_NAME "sb16"
621#endif 621#endif
622 622
623static struct isa_driver snd_sb16_isa_driver = { 623static struct isa_driver snd_sb16_isa_driver = {
@@ -629,7 +629,7 @@ static struct isa_driver snd_sb16_isa_driver = {
629 .resume = snd_sb16_isa_resume, 629 .resume = snd_sb16_isa_resume,
630#endif 630#endif
631 .driver = { 631 .driver = {
632 .name = SND_SB16_DRIVER 632 .name = DEV_NAME
633 }, 633 },
634}; 634};
635 635
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index b7de1bc0e8a4..a1b3786b391e 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -239,7 +239,7 @@ static int snd_sb8_resume(struct device *dev, unsigned int n)
239} 239}
240#endif 240#endif
241 241
242#define SND_SB8_DRIVER "snd_sb8" 242#define DEV_NAME "sb8"
243 243
244static struct isa_driver snd_sb8_driver = { 244static struct isa_driver snd_sb8_driver = {
245 .match = snd_sb8_match, 245 .match = snd_sb8_match,
@@ -250,7 +250,7 @@ static struct isa_driver snd_sb8_driver = {
250 .resume = snd_sb8_resume, 250 .resume = snd_sb8_resume,
251#endif 251#endif
252 .driver = { 252 .driver = {
253 .name = SND_SB8_DRIVER 253 .name = DEV_NAME
254 }, 254 },
255}; 255};
256 256
diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c
index 19e0b0edb8c4..922519def099 100644
--- a/sound/isa/sgalaxy.c
+++ b/sound/isa/sgalaxy.c
@@ -334,7 +334,7 @@ static int snd_sgalaxy_resume(struct device *pdev, unsigned int n)
334} 334}
335#endif 335#endif
336 336
337#define SND_SGALAXY_DRIVER "snd_sgalaxy" 337#define DEV_NAME "sgalaxy"
338 338
339static struct isa_driver snd_sgalaxy_driver = { 339static struct isa_driver snd_sgalaxy_driver = {
340 .match = snd_sgalaxy_match, 340 .match = snd_sgalaxy_match,
@@ -345,7 +345,7 @@ static struct isa_driver snd_sgalaxy_driver = {
345 .resume = snd_sgalaxy_resume, 345 .resume = snd_sgalaxy_resume,
346#endif 346#endif
347 .driver = { 347 .driver = {
348 .name = SND_SGALAXY_DRIVER 348 .name = DEV_NAME
349 }, 349 },
350}; 350};
351 351
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 369de44a6904..08c14978558c 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -1296,7 +1296,7 @@ static int __devexit snd_sscape_remove(struct device *devptr, unsigned int dev)
1296 return 0; 1296 return 0;
1297} 1297}
1298 1298
1299#define SSCAPE_DRIVER "snd_sscape" 1299#define DEV_NAME "sscape"
1300 1300
1301static struct isa_driver snd_sscape_driver = { 1301static struct isa_driver snd_sscape_driver = {
1302 .match = snd_sscape_match, 1302 .match = snd_sscape_match,
@@ -1304,7 +1304,7 @@ static struct isa_driver snd_sscape_driver = {
1304 .remove = __devexit_p(snd_sscape_remove), 1304 .remove = __devexit_p(snd_sscape_remove),
1305 /* FIXME: suspend/resume */ 1305 /* FIXME: suspend/resume */
1306 .driver = { 1306 .driver = {
1307 .name = SSCAPE_DRIVER 1307 .name = DEV_NAME
1308 }, 1308 },
1309}; 1309};
1310 1310
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 6f143275e3b3..ae2038e682f0 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -633,7 +633,7 @@ static int __devexit snd_wavefront_isa_remove(struct device *devptr,
633 return 0; 633 return 0;
634} 634}
635 635
636#define WAVEFRONT_DRIVER "snd_wavefront" 636#define DEV_NAME "wavefront"
637 637
638static struct isa_driver snd_wavefront_driver = { 638static struct isa_driver snd_wavefront_driver = {
639 .match = snd_wavefront_isa_match, 639 .match = snd_wavefront_isa_match,
@@ -641,7 +641,7 @@ static struct isa_driver snd_wavefront_driver = {
641 .remove = __devexit_p(snd_wavefront_isa_remove), 641 .remove = __devexit_p(snd_wavefront_isa_remove),
642 /* FIXME: suspend, resume */ 642 /* FIXME: suspend, resume */
643 .driver = { 643 .driver = {
644 .name = WAVEFRONT_DRIVER 644 .name = DEV_NAME
645 }, 645 },
646}; 646};
647 647