Commit 83c51c0a authored by Rene Herman's avatar Rene Herman Committed by Jaroslav Kysela

[ALSA] isa_bus device/driver naming

isa_bus: delete snd_ prefix from the (sysfs visible) device/driver names.
Signed-off-by: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent e4b6088c
...@@ -601,7 +601,7 @@ static int snd_cmi8330_isa_resume(struct device *dev, unsigned int n) ...@@ -601,7 +601,7 @@ static int snd_cmi8330_isa_resume(struct device *dev, unsigned int n)
} }
#endif #endif
#define CMI8330_DRIVER "snd_cmi8330" #define DEV_NAME "cmi8330"
static struct isa_driver snd_cmi8330_driver = { static struct isa_driver snd_cmi8330_driver = {
.match = snd_cmi8330_isa_match, .match = snd_cmi8330_isa_match,
...@@ -612,7 +612,7 @@ static struct isa_driver snd_cmi8330_driver = { ...@@ -612,7 +612,7 @@ static struct isa_driver snd_cmi8330_driver = {
.resume = snd_cmi8330_isa_resume, .resume = snd_cmi8330_isa_resume,
#endif #endif
.driver = { .driver = {
.name = CMI8330_DRIVER .name = DEV_NAME
}, },
}; };
......
...@@ -75,10 +75,10 @@ MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4235}," ...@@ -75,10 +75,10 @@ MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4235},"
#ifdef CS4232 #ifdef CS4232
#define IDENT "CS4232" #define IDENT "CS4232"
#define CS423X_DRIVER "snd_cs4232" #define DEV_NAME "cs4232"
#else #else
#define IDENT "CS4236+" #define IDENT "CS4236+"
#define CS423X_DRIVER "snd_cs4236" #define DEV_NAME "cs4236"
#endif #endif
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
...@@ -630,7 +630,7 @@ static struct isa_driver cs423x_isa_driver = { ...@@ -630,7 +630,7 @@ static struct isa_driver cs423x_isa_driver = {
.resume = snd_cs423x_isa_resume, .resume = snd_cs423x_isa_resume,
#endif #endif
.driver = { .driver = {
.name = CS423X_DRIVER .name = DEV_NAME
}, },
}; };
......
...@@ -2318,7 +2318,7 @@ static int snd_es18xx_isa_resume(struct device *dev, unsigned int n) ...@@ -2318,7 +2318,7 @@ static int snd_es18xx_isa_resume(struct device *dev, unsigned int n)
} }
#endif #endif
#define ES18XX_DRIVER "snd_es18xx" #define DEV_NAME "es18xx"
static struct isa_driver snd_es18xx_isa_driver = { static struct isa_driver snd_es18xx_isa_driver = {
.match = snd_es18xx_isa_match, .match = snd_es18xx_isa_match,
...@@ -2329,7 +2329,7 @@ static struct isa_driver snd_es18xx_isa_driver = { ...@@ -2329,7 +2329,7 @@ static struct isa_driver snd_es18xx_isa_driver = {
.resume = snd_es18xx_isa_resume, .resume = snd_es18xx_isa_resume,
#endif #endif
.driver = { .driver = {
.name = ES18XX_DRIVER .name = DEV_NAME
}, },
}; };
......
...@@ -358,7 +358,7 @@ static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev) ...@@ -358,7 +358,7 @@ static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev)
return 0; return 0;
} }
#define GUSMAX_DRIVER "snd_gusmax" #define DEV_NAME "gusmax"
static struct isa_driver snd_gusmax_driver = { static struct isa_driver snd_gusmax_driver = {
.match = snd_gusmax_match, .match = snd_gusmax_match,
...@@ -366,7 +366,7 @@ static struct isa_driver snd_gusmax_driver = { ...@@ -366,7 +366,7 @@ static struct isa_driver snd_gusmax_driver = {
.remove = __devexit_p(snd_gusmax_remove), .remove = __devexit_p(snd_gusmax_remove),
/* FIXME: suspend/resume */ /* FIXME: suspend/resume */
.driver = { .driver = {
.name = GUSMAX_DRIVER .name = DEV_NAME
}, },
}; };
......
...@@ -947,7 +947,7 @@ static int snd_opl3sa2_isa_resume(struct device *dev, unsigned int n) ...@@ -947,7 +947,7 @@ static int snd_opl3sa2_isa_resume(struct device *dev, unsigned int n)
} }
#endif #endif
#define OPL3SA2_DRIVER "snd_opl3sa2" #define DEV_NAME "opl3sa2"
static struct isa_driver snd_opl3sa2_isa_driver = { static struct isa_driver snd_opl3sa2_isa_driver = {
.match = snd_opl3sa2_isa_match, .match = snd_opl3sa2_isa_match,
...@@ -958,7 +958,7 @@ static struct isa_driver snd_opl3sa2_isa_driver = { ...@@ -958,7 +958,7 @@ static struct isa_driver snd_opl3sa2_isa_driver = {
.resume = snd_opl3sa2_isa_resume, .resume = snd_opl3sa2_isa_resume,
#endif #endif
.driver = { .driver = {
.name = OPL3SA2_DRIVER .name = DEV_NAME
}, },
}; };
......
...@@ -137,8 +137,6 @@ struct snd_miro { ...@@ -137,8 +137,6 @@ struct snd_miro {
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[] = { static char * snd_opti9xx_names[] = {
"unkown", "unkown",
"82C928", "82C929", "82C928", "82C929",
...@@ -1423,13 +1421,15 @@ static int __devexit snd_miro_remove(struct device *devptr, unsigned int dev) ...@@ -1423,13 +1421,15 @@ static int __devexit snd_miro_remove(struct device *devptr, unsigned int dev)
return 0; return 0;
} }
#define DEV_NAME "miro"
static struct isa_driver snd_miro_driver = { static struct isa_driver snd_miro_driver = {
.match = snd_miro_match, .match = snd_miro_match,
.probe = snd_miro_probe, .probe = snd_miro_probe,
.remove = __devexit_p(snd_miro_remove), .remove = __devexit_p(snd_miro_remove),
/* FIXME: suspend/resume */ /* FIXME: suspend/resume */
.driver = { .driver = {
.name = DRIVER_NAME .name = DEV_NAME
}, },
}; };
......
...@@ -280,10 +280,10 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids); ...@@ -280,10 +280,10 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids);
#endif /* CONFIG_PNP */ #endif /* CONFIG_PNP */
#ifdef OPTi93X #ifdef OPTi93X
#define DRIVER_NAME "snd-card-opti93x" #define DEV_NAME "opti93x"
#else #else
#define DRIVER_NAME "snd-card-opti92x" #define DEV_NAME "opti92x"
#endif /* OPTi93X */ #endif
static char * snd_opti9xx_names[] = { static char * snd_opti9xx_names[] = {
"unkown", "unkown",
...@@ -1289,7 +1289,7 @@ static int snd_opti93x_create(struct snd_card *card, struct snd_opti9xx *chip, ...@@ -1289,7 +1289,7 @@ static int snd_opti93x_create(struct snd_card *card, struct snd_opti9xx *chip,
} }
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_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", chip->irq);
snd_opti93x_free(codec); snd_opti93x_free(codec);
return -EBUSY; return -EBUSY;
...@@ -2015,7 +2015,7 @@ static struct isa_driver snd_opti9xx_driver = { ...@@ -2015,7 +2015,7 @@ static struct isa_driver snd_opti9xx_driver = {
.remove = __devexit_p(snd_opti9xx_isa_remove), .remove = __devexit_p(snd_opti9xx_isa_remove),
/* FIXME: suspend/resume */ /* FIXME: suspend/resume */
.driver = { .driver = {
.name = DRIVER_NAME .name = DEV_NAME
}, },
}; };
......
...@@ -615,9 +615,9 @@ static int snd_sb16_isa_resume(struct device *dev, unsigned int n) ...@@ -615,9 +615,9 @@ static int snd_sb16_isa_resume(struct device *dev, unsigned int n)
#endif #endif
#ifdef SNDRV_SBAWE #ifdef SNDRV_SBAWE
#define SND_SB16_DRIVER "snd_sbawe" #define DEV_NAME "sbawe"
#else #else
#define SND_SB16_DRIVER "snd_sb16" #define DEV_NAME "sb16"
#endif #endif
static struct isa_driver snd_sb16_isa_driver = { static struct isa_driver snd_sb16_isa_driver = {
...@@ -629,7 +629,7 @@ 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, .resume = snd_sb16_isa_resume,
#endif #endif
.driver = { .driver = {
.name = SND_SB16_DRIVER .name = DEV_NAME
}, },
}; };
......
...@@ -239,7 +239,7 @@ static int snd_sb8_resume(struct device *dev, unsigned int n) ...@@ -239,7 +239,7 @@ static int snd_sb8_resume(struct device *dev, unsigned int n)
} }
#endif #endif
#define SND_SB8_DRIVER "snd_sb8" #define DEV_NAME "sb8"
static struct isa_driver snd_sb8_driver = { static struct isa_driver snd_sb8_driver = {
.match = snd_sb8_match, .match = snd_sb8_match,
...@@ -250,7 +250,7 @@ static struct isa_driver snd_sb8_driver = { ...@@ -250,7 +250,7 @@ static struct isa_driver snd_sb8_driver = {
.resume = snd_sb8_resume, .resume = snd_sb8_resume,
#endif #endif
.driver = { .driver = {
.name = SND_SB8_DRIVER .name = DEV_NAME
}, },
}; };
......
...@@ -334,7 +334,7 @@ static int snd_sgalaxy_resume(struct device *pdev, unsigned int n) ...@@ -334,7 +334,7 @@ static int snd_sgalaxy_resume(struct device *pdev, unsigned int n)
} }
#endif #endif
#define SND_SGALAXY_DRIVER "snd_sgalaxy" #define DEV_NAME "sgalaxy"
static struct isa_driver snd_sgalaxy_driver = { static struct isa_driver snd_sgalaxy_driver = {
.match = snd_sgalaxy_match, .match = snd_sgalaxy_match,
...@@ -345,7 +345,7 @@ static struct isa_driver snd_sgalaxy_driver = { ...@@ -345,7 +345,7 @@ static struct isa_driver snd_sgalaxy_driver = {
.resume = snd_sgalaxy_resume, .resume = snd_sgalaxy_resume,
#endif #endif
.driver = { .driver = {
.name = SND_SGALAXY_DRIVER .name = DEV_NAME
}, },
}; };
......
...@@ -1296,7 +1296,7 @@ static int __devexit snd_sscape_remove(struct device *devptr, unsigned int dev) ...@@ -1296,7 +1296,7 @@ static int __devexit snd_sscape_remove(struct device *devptr, unsigned int dev)
return 0; return 0;
} }
#define SSCAPE_DRIVER "snd_sscape" #define DEV_NAME "sscape"
static struct isa_driver snd_sscape_driver = { static struct isa_driver snd_sscape_driver = {
.match = snd_sscape_match, .match = snd_sscape_match,
...@@ -1304,7 +1304,7 @@ static struct isa_driver snd_sscape_driver = { ...@@ -1304,7 +1304,7 @@ static struct isa_driver snd_sscape_driver = {
.remove = __devexit_p(snd_sscape_remove), .remove = __devexit_p(snd_sscape_remove),
/* FIXME: suspend/resume */ /* FIXME: suspend/resume */
.driver = { .driver = {
.name = SSCAPE_DRIVER .name = DEV_NAME
}, },
}; };
......
...@@ -633,7 +633,7 @@ static int __devexit snd_wavefront_isa_remove(struct device *devptr, ...@@ -633,7 +633,7 @@ static int __devexit snd_wavefront_isa_remove(struct device *devptr,
return 0; return 0;
} }
#define WAVEFRONT_DRIVER "snd_wavefront" #define DEV_NAME "wavefront"
static struct isa_driver snd_wavefront_driver = { static struct isa_driver snd_wavefront_driver = {
.match = snd_wavefront_isa_match, .match = snd_wavefront_isa_match,
...@@ -641,7 +641,7 @@ static struct isa_driver snd_wavefront_driver = { ...@@ -641,7 +641,7 @@ static struct isa_driver snd_wavefront_driver = {
.remove = __devexit_p(snd_wavefront_isa_remove), .remove = __devexit_p(snd_wavefront_isa_remove),
/* FIXME: suspend, resume */ /* FIXME: suspend, resume */
.driver = { .driver = {
.name = WAVEFRONT_DRIVER .name = DEV_NAME
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment