ASoC: soc.h: add asoc_link_to_cpu/codec/platform() macro
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 22 Mar 2021 02:48:15 +0000 (11:48 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 25 Mar 2021 13:58:52 +0000 (13:58 +0000)
We shouldn't use dai_link->cpus/codecs/platforms directly,
because these are array now to supporting multi CPU/Codec/Platform.
This patch adds asoc_link_to_xxx() macro for it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/874kh3aopc.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
include/sound/soc.h

index 78609ab..e416107 100644 (file)
@@ -716,20 +716,38 @@ struct snd_soc_dai_link {
        struct snd_soc_dobj dobj; /* For topology */
 #endif
 };
+
+static inline struct snd_soc_dai_link_component*
+asoc_link_to_cpu(struct snd_soc_dai_link *link, int n) {
+       return &(link)->cpus[n];
+}
+
+static inline struct snd_soc_dai_link_component*
+asoc_link_to_codec(struct snd_soc_dai_link *link, int n) {
+       return &(link)->codecs[n];
+}
+
+static inline struct snd_soc_dai_link_component*
+asoc_link_to_platform(struct snd_soc_dai_link *link, int n) {
+       return &(link)->platforms[n];
+}
+
 #define for_each_link_codecs(link, i, codec)                           \
        for ((i) = 0;                                                   \
-            ((i) < link->num_codecs) && ((codec) = &link->codecs[i]);  \
+            ((i) < link->num_codecs) &&                                \
+                    ((codec) = asoc_link_to_codec(link, i));           \
             (i)++)
 
 #define for_each_link_platforms(link, i, platform)                     \
        for ((i) = 0;                                                   \
             ((i) < link->num_platforms) &&                             \
-            ((platform) = &link->platforms[i]);                        \
+                    ((platform) = asoc_link_to_platform(link, i));     \
             (i)++)
 
 #define for_each_link_cpus(link, i, cpu)                               \
        for ((i) = 0;                                                   \
-            ((i) < link->num_cpus) && ((cpu) = &link->cpus[i]);        \
+            ((i) < link->num_cpus) &&                                  \
+                    ((cpu) = asoc_link_to_cpu(link, i));               \
             (i)++)
 
 /*