Commit 0f23f718 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/874l0rbu1i.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7ce6088f
...@@ -1905,6 +1905,42 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) ...@@ -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) static void soc_cleanup_card_resources(struct snd_soc_card *card)
{ {
struct snd_soc_dai_link *link, *_link; struct snd_soc_dai_link *link, *_link;
...@@ -2070,24 +2106,12 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) ...@@ -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 */ /* try to set some sane longname if DMI is available */
snd_soc_set_dmi_name(card, NULL); snd_soc_set_dmi_name(card, NULL);
snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname), soc_setup_card_name(card->snd_card->shortname,
"%s", card->name); card->name, NULL, 0);
snprintf(card->snd_card->longname, sizeof(card->snd_card->longname), soc_setup_card_name(card->snd_card->longname,
"%s", card->long_name ? card->long_name : card->name); card->long_name, card->name, 0);
snprintf(card->snd_card->driver, sizeof(card->snd_card->driver), soc_setup_card_name(card->snd_card->driver,
"%s", card->driver_name ? card->driver_name : card->name); card->driver_name, card->name, 1);
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;
}
}
if (card->late_probe) { if (card->late_probe) {
ret = card->late_probe(card); ret = card->late_probe(card);
......
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