ASoC: soc-core: merge soc_add_pcm_runtime() into soc_new_pcm_runtime()

We have soc_new_pcm_runtime() which allocs rtd and its related memory,
and     soc_add_pcm_runtime() which connects rtd to card.

But we don't need to separate these, we can alloc and connect rtd
in the same time.

Current implementation is just makes code complex.
This patch merges these into one.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ef0mf7sl.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 96d38db8b578cf2fa4c22b07535bd26d899f0c37..cadf96bc00970e13c29fb5febbc9dae683b590fb 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -385,16 +385,12 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime(
                return NULL;
        }
 
-       return rtd;
-}
-
-static void soc_add_pcm_runtime(struct snd_soc_card *card,
-               struct snd_soc_pcm_runtime *rtd)
-{
        /* see for_each_card_rtds */
        list_add_tail(&rtd->list, &card->rtd_list);
        rtd->num = card->num_rtd;
        card->num_rtd++;
+
+       return rtd;
 }
 
 static void soc_remove_pcm_runtimes(struct snd_soc_card *card)
@@ -930,7 +926,6 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
                }
        }
 
-       soc_add_pcm_runtime(card, rtd);
        return 0;
 
 _err_defer: