aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/opti9xx/opti92x-ad1848.c
diff options
context:
space:
mode:
authorRene Herman <rene.herman@gmail.com>2007-03-20 06:33:46 -0400
committerJaroslav Kysela <perex@suse.cz>2007-05-11 10:55:50 -0400
commit83c51c0ab08f55468d8f5444ff2f70a36841a21f (patch)
treeb961dfec390caeb84fb065ee67000b8cac3fd12c /sound/isa/opti9xx/opti92x-ad1848.c
parente4b6088c8cf16781f7f7b887811b164daf625968 (diff)
[ALSA] isa_bus device/driver naming
isa_bus: delete snd_ prefix from the (sysfs visible) device/driver names. Signed-off-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/isa/opti9xx/opti92x-ad1848.c')
-rw-r--r--sound/isa/opti9xx/opti92x-ad1848.c10
1 files changed, 5 insertions, 5 deletions
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