korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-22 04:31:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: soc-core: self contained soc_bind_aux_dev()

Browse Source 
Current soc_bind_aux_dev() implementation is very half,
thus it is very unreadable.

	for_each_card_pre_auxs(xxx) {
=>		ret = soc_bind_aux_dev(xxx);
		...
	}

This patch does all for_each_xxx() under soc_bind_aux_dev(),
and makes it to self contained.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87tv9sor1b.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-09-04 09:15:28 +09:00 committed by Mark Brown
parent bc7c16c226
commit bee886f1ea
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1559,20 +1559,22 @@ static int soc_link_init(struct snd_soc_card *card,
return ret;
}
static int soc_bind_aux_dev(struct snd_soc_card *card,
struct snd_soc_aux_dev *aux_dev)
static int soc_bind_aux_dev(struct snd_soc_card *card)
{
struct snd_soc_component *component;
struct snd_soc_aux_dev *aux;
int i;
for_each_card_pre_auxs(card, i, aux) {
/* codecs, usually analog devices */
component = soc_find_component(&aux_dev->dlc);
component = soc_find_component(&aux->dlc);
if (!component)
return -EPROBE_DEFER;
component->init = aux_dev->init;
component->init = aux->init;
/* see for_each_card_auxs */
list_add(&component->card_aux_list, &card->aux_comp_list);
}
return 0;
}
@ -1937,7 +1939,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
{
struct snd_soc_pcm_runtime *rtd;
struct snd_soc_dai_link *dai_link;
struct snd_soc_aux_dev *aux;
int ret, i;
mutex_lock(&client_mutex);
@ -1965,11 +1966,9 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
}
/* bind aux_devs too */
for_each_card_pre_auxs(card, i, aux) {
ret = soc_bind_aux_dev(card, aux);
if (ret != 0)
ret = soc_bind_aux_dev(card);
if (ret < 0)
goto probe_end;
}
/* add predefined DAI links to the list */
for_each_card_prelinks(card, i, dai_link) {