ASoC: soc-core: merge snd_soc_initialize_card_lists()

snd_soc_initialize_card_lists() is doing card related
INIT_LIST_HEAD(), but, it is already doing at
snd_soc_register_card(). We don't need to do it separately.
This patch merges these.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/877e781ldq.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

1 files changed, 8 insertions, 5 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b3f820fb53e6..d428491d51a7 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2370,15 +2370,18 @@ int snd_soc_register_card(struct snd_soc_card *card)
 
         dev_set_drvdata(card->dev, card);
 
-        snd_soc_initialize_card_lists(card);
-
+        INIT_LIST_HEAD(&card->widgets);
+        INIT_LIST_HEAD(&card->paths);
+        INIT_LIST_HEAD(&card->dapm_list);
+        INIT_LIST_HEAD(&card->aux_comp_list);
+        INIT_LIST_HEAD(&card->component_dev_list);
+        INIT_LIST_HEAD(&card->list);
         INIT_LIST_HEAD(&card->dai_link_list);
-
         INIT_LIST_HEAD(&card->rtd_list);
-        card->num_rtd = 0;
-
         INIT_LIST_HEAD(&card->dapm_dirty);
         INIT_LIST_HEAD(&card->dobj_list);
+
+        card->num_rtd = 0;
         card->instantiated = 0;
         mutex_init(&card->mutex);
         mutex_init(&card->dapm_mutex);