redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[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>
hifive-unleashed-5.1
Rene Herman 2007-03-20 11:33:46 +01:00 committed by Jaroslav Kysela
parent e4b6088c8c
commit 83c51c0ab0
12 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/isa/cmi8330.c
View File

@ -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
},
};

6
sound/isa/cs423x/cs4236.c
View File

@ -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
},
};

4
sound/isa/es18xx.c
View File

@ -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
},
};

4
sound/isa/gus/gusmax.c
View File

@ -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
},
};

4
sound/isa/opl3sa2.c
View File

@ -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
},
};

6
sound/isa/opti9xx/miro.c
View File

@ -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
},
};

10
sound/isa/opti9xx/opti92x-ad1848.c
View File

@ -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
},
};

6
sound/isa/sb/sb16.c
View File

@ -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
},
};

4
sound/isa/sb/sb8.c
View File

@ -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
},
};

4
sound/isa/sgalaxy.c
View File

@ -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
},
};

4
sound/isa/sscape.c
View File

@ -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
},
};

4
sound/isa/wavefront/wavefront.c
View File

@ -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
},
};