aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/opti9xx
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/opti9xx')
-rw-r--r--sound/isa/opti9xx/miro.c6
-rw-r--r--sound/isa/opti9xx/opti92x-ad1848.c10
2 files changed, 8 insertions, 8 deletions
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