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>
12 files changed:
-#define CMI8330_DRIVER "snd_cmi8330"
+#define DEV_NAME "cmi8330"
static struct isa_driver snd_cmi8330_driver = {
.match = snd_cmi8330_isa_match,
static struct isa_driver snd_cmi8330_driver = {
.match = snd_cmi8330_isa_match,
.resume = snd_cmi8330_isa_resume,
#endif
.driver = {
.resume = snd_cmi8330_isa_resume,
#endif
.driver = {
#ifdef CS4232
#define IDENT "CS4232"
#ifdef CS4232
#define IDENT "CS4232"
-#define CS423X_DRIVER "snd_cs4232"
+#define DEV_NAME "cs4232"
#else
#define IDENT "CS4236+"
#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 */
#endif
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
.resume = snd_cs423x_isa_resume,
#endif
.driver = {
.resume = snd_cs423x_isa_resume,
#endif
.driver = {
-#define ES18XX_DRIVER "snd_es18xx"
+#define DEV_NAME "es18xx"
static struct isa_driver snd_es18xx_isa_driver = {
.match = snd_es18xx_isa_match,
static struct isa_driver snd_es18xx_isa_driver = {
.match = snd_es18xx_isa_match,
.resume = snd_es18xx_isa_resume,
#endif
.driver = {
.resume = snd_es18xx_isa_resume,
#endif
.driver = {
-#define GUSMAX_DRIVER "snd_gusmax"
+#define DEV_NAME "gusmax"
static struct isa_driver snd_gusmax_driver = {
.match = snd_gusmax_match,
static struct isa_driver snd_gusmax_driver = {
.match = snd_gusmax_match,
.remove = __devexit_p(snd_gusmax_remove),
/* FIXME: suspend/resume */
.driver = {
.remove = __devexit_p(snd_gusmax_remove),
/* FIXME: suspend/resume */
.driver = {
-#define OPL3SA2_DRIVER "snd_opl3sa2"
+#define DEV_NAME "opl3sa2"
static struct isa_driver snd_opl3sa2_isa_driver = {
.match = snd_opl3sa2_isa_match,
static struct isa_driver snd_opl3sa2_isa_driver = {
.match = snd_opl3sa2_isa_match,
.resume = snd_opl3sa2_isa_resume,
#endif
.driver = {
.resume = snd_opl3sa2_isa_resume,
#endif
.driver = {
static void snd_miro_proc_init(struct snd_miro * miro);
static void snd_miro_proc_init(struct snd_miro * miro);
-#define DRIVER_NAME "snd-miro"
-
static char * snd_opti9xx_names[] = {
"unkown",
"82C928", "82C929",
static char * snd_opti9xx_names[] = {
"unkown",
"82C928", "82C929",
+#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 = {
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 = {
#endif /* CONFIG_PNP */
#ifdef OPTi93X
#endif /* CONFIG_PNP */
#ifdef OPTi93X
-#define DRIVER_NAME "snd-card-opti93x"
+#define DEV_NAME "opti93x"
-#define DRIVER_NAME "snd-card-opti92x"
-#endif /* OPTi93X */
+#define DEV_NAME "opti92x"
+#endif
static char * snd_opti9xx_names[] = {
"unkown",
static char * snd_opti9xx_names[] = {
"unkown",
}
codec->dma2 = chip->dma2;
}
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;
snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", chip->irq);
snd_opti93x_free(codec);
return -EBUSY;
.remove = __devexit_p(snd_opti9xx_isa_remove),
/* FIXME: suspend/resume */
.driver = {
.remove = __devexit_p(snd_opti9xx_isa_remove),
/* FIXME: suspend/resume */
.driver = {
#endif
#ifdef SNDRV_SBAWE
#endif
#ifdef SNDRV_SBAWE
-#define SND_SB16_DRIVER "snd_sbawe"
+#define DEV_NAME "sbawe"
-#define SND_SB16_DRIVER "snd_sb16"
#endif
static struct isa_driver snd_sb16_isa_driver = {
#endif
static struct isa_driver snd_sb16_isa_driver = {
.resume = snd_sb16_isa_resume,
#endif
.driver = {
.resume = snd_sb16_isa_resume,
#endif
.driver = {
- .name = SND_SB16_DRIVER
-#define SND_SB8_DRIVER "snd_sb8"
static struct isa_driver snd_sb8_driver = {
.match = snd_sb8_match,
static struct isa_driver snd_sb8_driver = {
.match = snd_sb8_match,
.resume = snd_sb8_resume,
#endif
.driver = {
.resume = snd_sb8_resume,
#endif
.driver = {
-#define SND_SGALAXY_DRIVER "snd_sgalaxy"
+#define DEV_NAME "sgalaxy"
static struct isa_driver snd_sgalaxy_driver = {
.match = snd_sgalaxy_match,
static struct isa_driver snd_sgalaxy_driver = {
.match = snd_sgalaxy_match,
.resume = snd_sgalaxy_resume,
#endif
.driver = {
.resume = snd_sgalaxy_resume,
#endif
.driver = {
- .name = SND_SGALAXY_DRIVER
-#define SSCAPE_DRIVER "snd_sscape"
+#define DEV_NAME "sscape"
static struct isa_driver snd_sscape_driver = {
.match = snd_sscape_match,
static struct isa_driver snd_sscape_driver = {
.match = snd_sscape_match,
.remove = __devexit_p(snd_sscape_remove),
/* FIXME: suspend/resume */
.driver = {
.remove = __devexit_p(snd_sscape_remove),
/* FIXME: suspend/resume */
.driver = {
-#define WAVEFRONT_DRIVER "snd_wavefront"
+#define DEV_NAME "wavefront"
static struct isa_driver snd_wavefront_driver = {
.match = snd_wavefront_isa_match,
static struct isa_driver snd_wavefront_driver = {
.match = snd_wavefront_isa_match,
.remove = __devexit_p(snd_wavefront_isa_remove),
/* FIXME: suspend, resume */
.driver = {
.remove = __devexit_p(snd_wavefront_isa_remove),
/* FIXME: suspend, resume */
.driver = {
- .name = WAVEFRONT_DRIVER