Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 15:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: soc-core: merge soc_set_name_prefix() and soc_set_of_name_prefix()

Browse Source 
soc_set_name_prefix() is calling soc_set_of_name_prefix().
We don't need to separate these operation.
This patch merges these.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87fthrbhzo.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-12-11 13:31:39 +09:00 committed by Mark Brown
parent 93ec6953c1
commit 29d9fc7aca
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1206,22 +1206,12 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,
return ret;
}
static void soc_set_of_name_prefix(struct snd_soc_component *component)
{
struct device_node *of_node = soc_component_to_node(component);
const char *str;
int ret;
ret = of_property_read_string(of_node, "sound-name-prefix", &str);
if (!ret)
component->name_prefix = str;
}
static void soc_set_name_prefix(struct snd_soc_card *card,
struct snd_soc_component *component)
{
struct device_node *of_node = soc_component_to_node(component);
int i;
const char *str;
int ret, i;
for (i = 0; i < card->num_configs; i++) {
struct snd_soc_codec_conf *map = &card->codec_conf[i];
@ -1238,7 +1228,11 @@ static void soc_set_name_prefix(struct snd_soc_card *card,
* If there is no configuration table or no match in the table,
* check if a prefix is provided in the node
*/
soc_set_of_name_prefix(component);
ret = of_property_read_string(of_node, "sound-name-prefix", &str);
if (ret < 0)
return;
component->name_prefix = str;
}
static void soc_remove_component(struct snd_soc_component *component,