ASoC: core: Add helpers for codec DAI probe & remove

Add helper functions for codec DAI probe and remove in
preparation for DAI-multicodec support.

No functional change.

Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
[fparent@baylibre.com: Adapt to 3.14+]
Signed-off-by: Fabien Parent <fparent@baylibre.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 674da7049db4490cb380c0e66e3bd0c0f489cd6e..1e4945d614a4a4998a10686a63ea40732c0ecad7 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1010,21 +1010,10 @@ static void soc_remove_codec(struct snd_soc_codec *codec)
        module_put(codec->dev->driver->owner);
 }
 
-static void soc_remove_link_dais(struct snd_soc_card *card, int num, int order)
+static void soc_remove_codec_dai(struct snd_soc_dai *codec_dai, int order)
 {
-       struct snd_soc_pcm_runtime *rtd = &card->rtd[num];
-       struct snd_soc_dai *codec_dai = rtd->codec_dai, *cpu_dai = rtd->cpu_dai;
        int err;
 
-       /* unregister the rtd device */
-       if (rtd->dev_registered) {
-               device_remove_file(rtd->dev, &dev_attr_pmdown_time);
-               device_remove_file(rtd->dev, &dev_attr_codec_reg);
-               device_unregister(rtd->dev);
-               rtd->dev_registered = 0;
-       }
-
-       /* remove the CODEC DAI */
        if (codec_dai && codec_dai->probed &&
                        codec_dai->driver->remove_order == order) {
                if (codec_dai->driver->remove) {
@@ -1037,6 +1026,24 @@ static void soc_remove_link_dais(struct snd_soc_card *card, int num, int order)
                codec_dai->probed = 0;
                list_del(&codec_dai->card_list);
        }
+}
+
+static void soc_remove_link_dais(struct snd_soc_card *card, int num, int order)
+{
+       struct snd_soc_pcm_runtime *rtd = &card->rtd[num];
+       struct snd_soc_dai *codec_dai = rtd->codec_dai, *cpu_dai = rtd->cpu_dai;
+       int err;
+
+       /* unregister the rtd device */
+       if (rtd->dev_registered) {
+               device_remove_file(rtd->dev, &dev_attr_pmdown_time);
+               device_remove_file(rtd->dev, &dev_attr_codec_reg);
+               device_unregister(rtd->dev);
+               rtd->dev_registered = 0;
+       }
+
+       /* remove the CODEC DAI */
+       soc_remove_codec_dai(codec_dai, order);
 
        /* remove the cpu_dai */
        if (cpu_dai && cpu_dai->probed &&
@@ -1381,6 +1388,31 @@ static int soc_probe_link_components(struct snd_soc_card *card, int num,
        return 0;
 }
 
+static int soc_probe_codec_dai(struct snd_soc_card *card,
+                              struct snd_soc_dai *codec_dai,
+                              int order)
+{
+       int ret;
+
+       if (!codec_dai->probed && codec_dai->driver->probe_order == order) {
+               if (codec_dai->driver->probe) {
+                       ret = codec_dai->driver->probe(codec_dai);
+                       if (ret < 0) {
+                               dev_err(codec_dai->dev,
+                                       "ASoC: failed to probe CODEC DAI %s: %d\n",
+                                       codec_dai->name, ret);
+                               return ret;
+                       }
+               }
+
+               /* mark codec_dai as probed and add to card dai list */
+               codec_dai->probed = 1;
+               list_add(&codec_dai->card_list, &card->dai_dev_list);
+       }
+
+       return 0;
+}
+
 static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
 {
        struct snd_soc_dai_link *dai_link = &card->dai_link[num];
@@ -1430,21 +1462,9 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
        }
 
        /* probe the CODEC DAI */
-       if (!codec_dai->probed && codec_dai->driver->probe_order == order) {
-               if (codec_dai->driver->probe) {
-                       ret = codec_dai->driver->probe(codec_dai);
-                       if (ret < 0) {
-                               dev_err(codec_dai->dev,
-                                       "ASoC: failed to probe CODEC DAI %s: %d\n",
-                                       codec_dai->name, ret);
-                               return ret;
-                       }
-               }
-
-               /* mark codec_dai as probed and add to card dai list */
-               codec_dai->probed = 1;
-               list_add(&codec_dai->card_list, &card->dai_dev_list);
-       }
+       ret = soc_probe_codec_dai(card, codec_dai, order);
+       if (ret)
+               return ret;
 
        /* complete DAI probe during last probe */
        if (order != SND_SOC_COMP_ORDER_LAST)