openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: soc-core: add soc_setup_card_name() 

ALSA needs to setup shortname, longname, and driver.
These methods are very similar.
This patch adds new soc_setup_card_name() and setup these.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/874l0rbu1i.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-10-02 14:22:49 +09:00 committed by Mark Brown
parent 7ce6088f60
commit 0f23f718ec
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
sound/soc/soc-core.c
View File

@ -1905,6 +1905,42 @@ static void soc_check_tplg_fes(struct snd_soc_card *card)
}
}
#define soc_setup_card_name(name, name1, name2, norm) \
__soc_setup_card_name(name, sizeof(name), name1, name2, norm)
static void __soc_setup_card_name(char *name, int len,
const char *name1, const char *name2,
int normalization)
{
int i;
snprintf(name, len, "%s", name1 ? name1 : name2);
if (!normalization)
return;
/*
* Name normalization
*
* The driver name is somewhat special, as it's used as a key for
* searches in the user-space.
*
* ex)
* "abcd??efg" -> "abcd__efg"
*/
for (i = 0; i < len; i++) {
switch (name[i]) {
case '_':
case '-':
case '\0':
break;
default:
if (!isalnum(name[i]))
name[i] = '_';
break;
}
}
}
static void soc_cleanup_card_resources(struct snd_soc_card *card)
{
struct snd_soc_dai_link *link, *_link;
@ -2070,24 +2106,12 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
/* try to set some sane longname if DMI is available */
snd_soc_set_dmi_name(card, NULL);
snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname),
"%s", card->name);
snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),
"%s", card->long_name ? card->long_name : card->name);
snprintf(card->snd_card->driver, sizeof(card->snd_card->driver),
"%s", card->driver_name ? card->driver_name : card->name);
for (i = 0; i < ARRAY_SIZE(card->snd_card->driver); i++) {
switch (card->snd_card->driver[i]) {
case '_':
case '-':
case '\0':
break;
default:
if (!isalnum(card->snd_card->driver[i]))
card->snd_card->driver[i] = '_';
break;
}
}
soc_setup_card_name(card->snd_card->shortname,
card->name, NULL, 0);
soc_setup_card_name(card->snd_card->longname,
card->long_name, card->name, 0);
soc_setup_card_name(card->snd_card->driver,
card->driver_name, card->name, 1);
if (card->late_probe) {
ret = card->late_probe(card);