ASoC: soc-dai: add snd_soc_pcm_dai_prepare()

We have 2 type of component functions
snd_soc_dai_xxx()     is focusing to dai itself,
snd_soc_pcm_dai_xxx() is focusing to rtd related dai.

Now we can update snd_soc_dai_prepare() to
snd_soc_pcm_dai_prepare(). This patch do it.

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

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index fd7e203315e656ef7eb448af69b5a3c10e7102a3..1b25318b6325415d6bb064a6f84b0211828797e5 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -154,8 +154,6 @@ int snd_soc_dai_startup(struct snd_soc_dai *dai,
                        struct snd_pcm_substream *substream);
 void snd_soc_dai_shutdown(struct snd_soc_dai *dai,
                          struct snd_pcm_substream *substream);
-int snd_soc_dai_prepare(struct snd_soc_dai *dai,
-                       struct snd_pcm_substream *substream);
 int snd_soc_dai_trigger(struct snd_soc_dai *dai,
                        struct snd_pcm_substream *substream, int cmd);
 int snd_soc_dai_bespoke_trigger(struct snd_soc_dai *dai,
@@ -171,6 +169,7 @@ int snd_soc_dai_compress_new(struct snd_soc_dai *dai,
 bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream);
 
 int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd);
+int snd_soc_pcm_dai_prepare(struct snd_pcm_substream *substream);
 
 struct snd_soc_dai_ops {
        /*

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 1b45e6e114ade020d24ae3496d9dcbad064fdf1c..1a9cfdcfc73600f415e6a6ffa55f4b343af6c538 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -354,18 +354,6 @@ void snd_soc_dai_shutdown(struct snd_soc_dai *dai,
                dai->driver->ops->shutdown(substream, dai);
 }
 
-int snd_soc_dai_prepare(struct snd_soc_dai *dai,
-                       struct snd_pcm_substream *substream)
-{
-       int ret = 0;
-
-       if (dai->driver->ops &&
-           dai->driver->ops->prepare)
-               ret = dai->driver->ops->prepare(substream, dai);
-
-       return soc_dai_ret(dai, ret);
-}
-
 int snd_soc_dai_trigger(struct snd_soc_dai *dai,
                        struct snd_pcm_substream *substream,
                        int cmd)
@@ -461,3 +449,21 @@ int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd)
 
        return 0;
 }
+
+int snd_soc_pcm_dai_prepare(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *dai;
+       int i, ret;
+
+       for_each_rtd_dais(rtd, i, dai) {
+               if (dai->driver->ops &&
+                   dai->driver->ops->prepare) {
+                       ret = dai->driver->ops->prepare(substream, dai);
+                       if (ret < 0)
+                               return soc_dai_ret(dai, ret);
+               }
+       }
+
+       return 0;
+}

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 77a680da366f2792788b951025e9f3c090ffaede..f7b3dca1d152792489f132871c59e478b62b5d42 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -950,13 +950,10 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
                }
        }
 
-       for_each_rtd_dais(rtd, i, dai) {
-               ret = snd_soc_dai_prepare(dai, substream);
-               if (ret < 0) {
-                       dev_err(dai->dev,
-                               "ASoC: DAI prepare error: %d\n", ret);
-                       goto out;
-               }
+       ret = snd_soc_pcm_dai_prepare(substream);
+       if (ret < 0) {
+               dev_err(rtd->dev, "ASoC: DAI prepare error: %d\n", ret);
+               goto out;
        }
 
        /* cancel any delayed stream shutdown that is pending */