ASoC: soc-card: add snd_soc_card_late_probe()

Card related function should be implemented at soc-card now.
This patch adds it.

card has "card->probe" and "card->late_probe" callbacks,
and "late_probe" callback is called after "probe".
This means, we can set "card->probed" flag afer "late_probe"
for all cases.

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/87v9kgzv4w.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-card.h b/include/sound/soc-card.h
index 191285a0ce19346695c133b42e1612d785171093..521dc05e4e9f57e91ac731c3323d3a6e3013df1d 100644 (file)
--- a/include/sound/soc-card.h
+++ b/include/sound/soc-card.h
@@ -25,6 +25,7 @@ int snd_soc_card_resume_pre(struct snd_soc_card *card);
 int snd_soc_card_resume_post(struct snd_soc_card *card);
 
 int snd_soc_card_probe(struct snd_soc_card *card);
+int snd_soc_card_late_probe(struct snd_soc_card *card);
 
 /* device driver data */
 static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,

diff --git a/sound/soc/soc-card.c b/sound/soc/soc-card.c
index ff3bf379f166266ddc67aadb039ee13046cb9c00..317771d87e3fca0d7bf18e243a72bc454518c94f 100644 (file)
--- a/sound/soc/soc-card.c
+++ b/sound/soc/soc-card.c
@@ -142,3 +142,27 @@ int snd_soc_card_probe(struct snd_soc_card *card)
 
        return 0;
 }
+
+int snd_soc_card_late_probe(struct snd_soc_card *card)
+{
+       if (card->late_probe) {
+               int ret = card->late_probe(card);
+
+               if (ret < 0)
+                       return soc_card_ret(card, ret);
+       }
+
+       /*
+        * It has "card->probe" and "card->late_probe" callbacks,
+        * and "late_probe" callback is called after "probe".
+        * This means, we can set "card->probed" flag afer "late_probe"
+        * for all cases.
+        *
+        * see
+        *      snd_soc_bind_card()
+        *      snd_soc_card_probe()
+        */
+       card->probed = 1;
+
+       return 0;
+}

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 13a7d515853485c86441f194f96770bdc42cc871..42e8c11a0b26a3ff07ed0aca4cddac5ad62f1523 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1910,15 +1910,9 @@ static int snd_soc_bind_card(struct snd_soc_card *card)
                }
        }
 
-       if (card->late_probe) {
-               ret = card->late_probe(card);
-               if (ret < 0) {
-                       dev_err(card->dev, "ASoC: %s late_probe() failed: %d\n",
-                               card->name, ret);
-                       goto probe_end;
-               }
-       }
-       card->probed = 1;
+       ret = snd_soc_card_late_probe(card);
+       if (ret < 0)
+               goto probe_end;
 
        snd_soc_dapm_new_widgets(card);