Merge branch 'asoc-5.7' into asoc-5.8

[platform/kernel/linux-starfive.git] / include / sound / soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 946f88a..8f54226 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1146,14 +1146,16 @@ struct snd_soc_pcm_runtime {
        /* runtime devices */
        struct snd_pcm *pcm;
        struct snd_compr *compr;
-       struct snd_soc_dai *codec_dai;
-       struct snd_soc_dai *cpu_dai;
-       struct snd_soc_dai **dais;
 
-       struct snd_soc_dai **codec_dais;
+       /*
+        * dais = cpu_dai + codec_dai
+        * see
+        *      soc_new_pcm_runtime()
+        *      asoc_rtd_to_cpu()
+        *      asoc_rtd_to_codec()
+        */
+       struct snd_soc_dai **dais;
        unsigned int num_codecs;
-
-       struct snd_soc_dai **cpu_dais;
        unsigned int num_cpus;
 
        struct delayed_work delayed_work;
@@ -1182,16 +1184,16 @@ struct snd_soc_pcm_runtime {
             (i)++)
 #define for_each_rtd_cpu_dais(rtd, i, dai)                             \
        for ((i) = 0;                                                   \
-            ((i) < rtd->num_cpus) && ((dai) = rtd->cpu_dais[i]);       \
+            ((i) < rtd->num_cpus) && ((dai) = asoc_rtd_to_cpu(rtd, i)); \
             (i)++)
 #define for_each_rtd_cpu_dais_rollback(rtd, i, dai)            \
-       for (; (--(i) >= 0) && ((dai) = rtd->cpu_dais[i]);)
+       for (; (--(i) >= 0) && ((dai) = asoc_rtd_to_cpu(rtd, i));)
 #define for_each_rtd_codec_dais(rtd, i, dai)                           \
        for ((i) = 0;                                                   \
-            ((i) < rtd->num_codecs) && ((dai) = rtd->codec_dais[i]);   \
+            ((i) < rtd->num_codecs) && ((dai) = asoc_rtd_to_codec(rtd, i)); \
             (i)++)
 #define for_each_rtd_codec_dais_rollback(rtd, i, dai)          \
-       for (; (--(i) >= 0) && ((dai) = rtd->codec_dais[i]);)
+       for (; (--(i) >= 0) && ((dai) = asoc_rtd_to_codec(rtd, i));)
 #define for_each_rtd_dais(rtd, i, dai)                                 \
        for ((i) = 0;                                                   \
             ((i) < (rtd)->num_cpus + (rtd)->num_codecs) &&             \
@@ -1384,8 +1386,8 @@ struct snd_soc_dai *snd_soc_card_get_codec_dai(struct snd_soc_card *card,
        struct snd_soc_pcm_runtime *rtd;
 
        list_for_each_entry(rtd, &card->rtd_list, list) {
-               if (!strcmp(rtd->codec_dai->name, dai_name))
-                       return rtd->codec_dai;
+               if (!strcmp(asoc_rtd_to_codec(rtd, 0)->name, dai_name))
+                       return asoc_rtd_to_codec(rtd, 0);
        }
 
        return NULL;