diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-08-23 02:58:58 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-02 14:21:46 +0200 |
| commit | 6fb035502956ad1f338ca61c057653d5372ffd8c (patch) | |
| tree | eca7ca2b84b9c113e0482e21913fb438abef9b5b /sound | |
| parent | ASoC: soc-core: add snd_soc_dapm_init() (diff) | |
| download | linux-6fb035502956ad1f338ca61c057653d5372ffd8c.tar.xz linux-6fb035502956ad1f338ca61c057653d5372ffd8c.zip | |
ASoC: soc-core: move soc_probe_link_components() position
It is easy to read code if it is cleanly using paired function/naming,
like start <-> stop, register <-> unregister, etc, etc.
But, current ALSA SoC code is very random, unbalance, not paired, etc.
It is easy to create bug at the such code, and it will be difficult to
debug.
soc_probe_link_components() has paired soc_remove_link_components(),
but, these are implemented at different place.
So it is difficult to confirm code.
This patch moves soc_probe_link_components() next to
soc_remove_link_components().
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87o90g7lbd.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 | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 8e831ae59eb8..2a166abaade1 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1135,6 +1135,26 @@ 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) +{ + struct snd_soc_component *component; + struct snd_soc_rtdcom_list *rtdcom; + int ret; + + 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; + } + } + + return 0; +} + static void soc_remove_dai_links(struct snd_soc_card *card) { int order; @@ -1379,26 +1399,6 @@ static int soc_rtd_init(struct snd_soc_pcm_runtime *rtd, const char *name) return 0; } -static int soc_probe_link_components(struct snd_soc_card *card, - struct snd_soc_pcm_runtime *rtd, int order) -{ - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; - int ret; - - 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; - } - } - - return 0; -} - static int soc_probe_dai(struct snd_soc_dai *dai, int order) { int ret; |