Commit bee886f1 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-core: self contained soc_bind_aux_dev()

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87tv9sor1b.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent bc7c16c2
...@@ -1559,20 +1559,22 @@ static int soc_link_init(struct snd_soc_card *card, ...@@ -1559,20 +1559,22 @@ static int soc_link_init(struct snd_soc_card *card,
return ret; return ret;
} }
static int soc_bind_aux_dev(struct snd_soc_card *card, static int soc_bind_aux_dev(struct snd_soc_card *card)
struct snd_soc_aux_dev *aux_dev)
{ {
struct snd_soc_component *component; 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 */ /* codecs, usually analog devices */
component = soc_find_component(&aux_dev->dlc); component = soc_find_component(&aux->dlc);
if (!component) if (!component)
return -EPROBE_DEFER; return -EPROBE_DEFER;
component->init = aux_dev->init; component->init = aux->init;
/* see for_each_card_auxs */ /* see for_each_card_auxs */
list_add(&component->card_aux_list, &card->aux_comp_list); list_add(&component->card_aux_list, &card->aux_comp_list);
}
return 0; return 0;
} }
...@@ -1937,7 +1939,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) ...@@ -1937,7 +1939,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
{ {
struct snd_soc_pcm_runtime *rtd; struct snd_soc_pcm_runtime *rtd;
struct snd_soc_dai_link *dai_link; struct snd_soc_dai_link *dai_link;
struct snd_soc_aux_dev *aux;
int ret, i; int ret, i;
mutex_lock(&client_mutex); mutex_lock(&client_mutex);
...@@ -1965,11 +1966,9 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) ...@@ -1965,11 +1966,9 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
} }
/* bind aux_devs too */ /* bind aux_devs too */
for_each_card_pre_auxs(card, i, aux) { ret = soc_bind_aux_dev(card);
ret = soc_bind_aux_dev(card, aux); if (ret < 0)
if (ret != 0)
goto probe_end; goto probe_end;
}
/* add predefined DAI links to the list */ /* add predefined DAI links to the list */
for_each_card_prelinks(card, i, dai_link) { for_each_card_prelinks(card, i, dai_link) {
......
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