From 83c51c0ab08f55468d8f5444ff2f70a36841a21f Mon Sep 17 00:00:00 2001 From: Rene Herman Date: Tue, 20 Mar 2007 11:33:46 +0100 Subject: [PATCH] [ALSA] isa_bus device/driver naming isa_bus: delete snd_ prefix from the (sysfs visible) device/driver names. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/isa/cmi8330.c | 4 ++-- sound/isa/cs423x/cs4236.c | 6 +++--- sound/isa/es18xx.c | 4 ++-- sound/isa/gus/gusmax.c | 4 ++-- sound/isa/opl3sa2.c | 4 ++-- sound/isa/opti9xx/miro.c | 6 +++--- sound/isa/opti9xx/opti92x-ad1848.c | 10 +++++----- sound/isa/sb/sb16.c | 6 +++--- sound/isa/sb/sb8.c | 4 ++-- sound/isa/sgalaxy.c | 4 ++-- sound/isa/sscape.c | 4 ++-- sound/isa/wavefront/wavefront.c | 4 ++-- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c index 456156de07..214d65d94c 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) } #endif -#define CMI8330_DRIVER "snd_cmi8330" +#define DEV_NAME "cmi8330" static struct isa_driver snd_cmi8330_driver = { .match = snd_cmi8330_isa_match, @@ -612,7 +612,7 @@ static struct isa_driver snd_cmi8330_driver = { .resume = snd_cmi8330_isa_resume, #endif .driver = { - .name = CMI8330_DRIVER + .name = DEV_NAME }, }; diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index 7d9d4d562e..87f1392a2f 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c @@ -75,10 +75,10 @@ MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4235}," #ifdef CS4232 #define IDENT "CS4232" -#define CS423X_DRIVER "snd_cs4232" +#define DEV_NAME "cs4232" #else #define IDENT "CS4236+" -#define CS423X_DRIVER "snd_cs4236" +#define DEV_NAME "cs4236" #endif static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ @@ -630,7 +630,7 @@ static struct isa_driver cs423x_isa_driver = { .resume = snd_cs423x_isa_resume, #endif .driver = { - .name = CS423X_DRIVER + .name = DEV_NAME }, }; diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index 12b61af1a4..d2a9c7df0c 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) } #endif -#define ES18XX_DRIVER "snd_es18xx" +#define DEV_NAME "es18xx" static struct isa_driver snd_es18xx_isa_driver = { .match = snd_es18xx_isa_match, @@ -2329,7 +2329,7 @@ static struct isa_driver snd_es18xx_isa_driver = { .resume = snd_es18xx_isa_resume, #endif .driver = { - .name = ES18XX_DRIVER + .name = DEV_NAME }, }; diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c index a0d2f8fc27..708783d435 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) return 0; } -#define GUSMAX_DRIVER "snd_gusmax" +#define DEV_NAME "gusmax" static struct isa_driver snd_gusmax_driver = { .match = snd_gusmax_match, @@ -366,7 +366,7 @@ static struct isa_driver snd_gusmax_driver = { .remove = __devexit_p(snd_gusmax_remove), /* FIXME: suspend/resume */ .driver = { - .name = GUSMAX_DRIVER + .name = DEV_NAME }, }; diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index 50a812f1c8..48743eb85f 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) } #endif -#define OPL3SA2_DRIVER "snd_opl3sa2" +#define DEV_NAME "opl3sa2" static struct isa_driver snd_opl3sa2_isa_driver = { .match = snd_opl3sa2_isa_match, @@ -958,7 +958,7 @@ static struct isa_driver snd_opl3sa2_isa_driver = { .resume = snd_opl3sa2_isa_resume, #endif .driver = { - .name = OPL3SA2_DRIVER + .name = DEV_NAME }, }; diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index 33471bdbe2..cd29b30b36 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 95d0ab124d..60c120ffb9 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 }, }; diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c index 8b734a2390..2a19b0a39e 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) #endif #ifdef SNDRV_SBAWE -#define SND_SB16_DRIVER "snd_sbawe" +#define DEV_NAME "sbawe" #else -#define SND_SB16_DRIVER "snd_sb16" +#define DEV_NAME "sb16" #endif static struct isa_driver snd_sb16_isa_driver = { @@ -629,7 +629,7 @@ static struct isa_driver snd_sb16_isa_driver = { .resume = snd_sb16_isa_resume, #endif .driver = { - .name = SND_SB16_DRIVER + .name = DEV_NAME }, }; diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c index b7de1bc0e8..a1b3786b39 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) } #endif -#define SND_SB8_DRIVER "snd_sb8" +#define DEV_NAME "sb8" static struct isa_driver snd_sb8_driver = { .match = snd_sb8_match, @@ -250,7 +250,7 @@ static struct isa_driver snd_sb8_driver = { .resume = snd_sb8_resume, #endif .driver = { - .name = SND_SB8_DRIVER + .name = DEV_NAME }, }; diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c index 19e0b0edb8..922519def0 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) } #endif -#define SND_SGALAXY_DRIVER "snd_sgalaxy" +#define DEV_NAME "sgalaxy" static struct isa_driver snd_sgalaxy_driver = { .match = snd_sgalaxy_match, @@ -345,7 +345,7 @@ static struct isa_driver snd_sgalaxy_driver = { .resume = snd_sgalaxy_resume, #endif .driver = { - .name = SND_SGALAXY_DRIVER + .name = DEV_NAME }, }; diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 369de44a69..08c1497855 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) return 0; } -#define SSCAPE_DRIVER "snd_sscape" +#define DEV_NAME "sscape" static struct isa_driver snd_sscape_driver = { .match = snd_sscape_match, @@ -1304,7 +1304,7 @@ static struct isa_driver snd_sscape_driver = { .remove = __devexit_p(snd_sscape_remove), /* FIXME: suspend/resume */ .driver = { - .name = SSCAPE_DRIVER + .name = DEV_NAME }, }; diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c index 6f143275e3..ae2038e682 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, return 0; } -#define WAVEFRONT_DRIVER "snd_wavefront" +#define DEV_NAME "wavefront" static struct isa_driver snd_wavefront_driver = { .match = snd_wavefront_isa_match, @@ -641,7 +641,7 @@ static struct isa_driver snd_wavefront_driver = { .remove = __devexit_p(snd_wavefront_isa_remove), /* FIXME: suspend, resume */ .driver = { - .name = WAVEFRONT_DRIVER + .name = DEV_NAME }, }; -- 2.39.5