diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-09-04 09:14:46 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-09 11:01:45 +0100 |
| commit | 62f07a6b6dbaf0e7196b6911111d4666b5d03518 (patch) | |
| tree | 630e3104abbdece9fd5b53dedb260c4ea228083f /sound | |
| parent | 13ab0d1ab8ae4d1b3b247fd5caec2c10e35c7269 (diff) | |
ASoC: soc-core: self contained soc_probe_link_components()
Current soc_probe_link_components() implementation is very half,
thus it is very difficult to read.
for_each_comp_order(xxx) {
for_each_card_rtds(xxx) {
=> ret = soc_probe_link_components(xxx);
...
}
}
This patch does all for_each_xxx() under soc_probe_link_components(),
and makes it to self contained.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/874l1sq5mx.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 05a2aff843aa..04b98e6c7b2a 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1137,20 +1137,25 @@ static void soc_remove_link_components(struct snd_soc_card *card, } } -static int soc_probe_link_components(struct snd_soc_card *card, - struct snd_soc_pcm_runtime *rtd, int order) +static int soc_probe_link_components(struct snd_soc_card *card) { struct snd_soc_component *component; + struct snd_soc_pcm_runtime *rtd; struct snd_soc_rtdcom_list *rtdcom; - int ret; + int ret, order; - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; + for_each_comp_order(order) { + for_each_card_rtds(card, rtd) { + for_each_rtdcom(rtd, rtdcom) { + component = rtdcom->component; - if (component->driver->probe_order == order) { - ret = soc_probe_component(card, component); - if (ret < 0) - return ret; + if (component->driver->probe_order != order) + continue; + + ret = soc_probe_component(card, component); + if (ret < 0) + return ret; + } } } @@ -1990,16 +1995,11 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) } /* probe all components used by DAI links on this card */ - for_each_comp_order(order) { - for_each_card_rtds(card, rtd) { - ret = soc_probe_link_components(card, rtd, order); - if (ret < 0) { - dev_err(card->dev, - "ASoC: failed to instantiate card %d\n", - ret); - goto probe_end; - } - } + ret = soc_probe_link_components(card); + if (ret < 0) { + dev_err(card->dev, + "ASoC: failed to instantiate card %d\n", ret); + goto probe_end; } /* probe auxiliary components */ |