diff options
| author | Rene Herman <rene.herman@gmail.com> | 2007-03-20 11:33:46 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 16:55:50 +0200 |
| commit | 83c51c0ab08f55468d8f5444ff2f70a36841a21f (patch) | |
| tree | b961dfec390caeb84fb065ee67000b8cac3fd12c /sound/isa/opti9xx | |
| parent | e4b6088c8cf16781f7f7b887811b164daf625968 (diff) | |
| download | linux-83c51c0ab08f55468d8f5444ff2f70a36841a21f.tar.gz linux-83c51c0ab08f55468d8f5444ff2f70a36841a21f.tar.bz2 linux-83c51c0ab08f55468d8f5444ff2f70a36841a21f.zip | |
[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')
| -rw-r--r-- | sound/isa/opti9xx/miro.c | 6 | ||||
| -rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 10 |
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 { static void snd_miro_proc_init(struct snd_miro * miro); -#define DRIVER_NAME "snd-miro" - static char * snd_opti9xx_names[] = { "unkown", "82C928", "82C929", @@ -1423,13 +1421,15 @@ static int __devexit snd_miro_remove(struct device *devptr, unsigned int dev) return 0; } +#define DEV_NAME "miro" + static struct isa_driver snd_miro_driver = { .match = snd_miro_match, .probe = snd_miro_probe, .remove = __devexit_p(snd_miro_remove), /* FIXME: suspend/resume */ .driver = { - .name = DRIVER_NAME + .name = DEV_NAME }, }; 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); #endif /* CONFIG_PNP */ #ifdef OPTi93X -#define DRIVER_NAME "snd-card-opti93x" +#define DEV_NAME "opti93x" #else -#define DRIVER_NAME "snd-card-opti92x" -#endif /* OPTi93X */ +#define DEV_NAME "opti92x" +#endif static char * snd_opti9xx_names[] = { "unkown", @@ -1289,7 +1289,7 @@ static int snd_opti93x_create(struct snd_card *card, struct snd_opti9xx *chip, } codec->dma2 = chip->dma2; - if (request_irq(chip->irq, snd_opti93x_interrupt, IRQF_DISABLED, DRIVER_NAME" - WSS", codec)) { + if (request_irq(chip->irq, snd_opti93x_interrupt, IRQF_DISABLED, DEV_NAME" - WSS", codec)) { snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", chip->irq); snd_opti93x_free(codec); return -EBUSY; @@ -2015,7 +2015,7 @@ static struct isa_driver snd_opti9xx_driver = { .remove = __devexit_p(snd_opti9xx_isa_remove), /* FIXME: suspend/resume */ .driver = { - .name = DRIVER_NAME + .name = DEV_NAME }, }; |