]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
ASoC: soc-pcm: don't use "name" on __soc_pcm_params_symmetry() macro
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 16 Apr 2021 01:59:48 +0000 (10:59 +0900)
committerMark Brown <broonie@kernel.org>
Fri, 16 Apr 2021 13:34:10 +0000 (14:34 +0100)
__soc_pcm_params_symmetry() macro is using "name" as parameter
which will be exchanged to rate/channles/sample_bit, like below

dai->name => dai->rate
dai->name => dai->channels
dai->name => dai->sample_bit

But, dai itself has "name". This means

1) It is very confusable naming
2) It can't use dai->name

This patch use "xxx" instead of "name"

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/8735vryoob.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-pcm.c

index 02968a4e52b43fead08111a3dbf3c5e30ffc0ed9..a3fc27fc156f4bbc571f507f7c3c41967c06ac50 100644 (file)
@@ -386,16 +386,16 @@ static int soc_pcm_params_symmetry(struct snd_pcm_substream *substream,
 
        soc_pcm_set_dai_params(&d, params);
 
-#define __soc_pcm_params_symmetry(name)                                        \
-       symmetry = rtd->dai_link->symmetric_##name;                     \
+#define __soc_pcm_params_symmetry(xxx)                                 \
+       symmetry = rtd->dai_link->symmetric_##xxx;                      \
        for_each_rtd_dais(rtd, i, dai)                                  \
-               symmetry |= dai->driver->symmetric_##name;              \
+               symmetry |= dai->driver->symmetric_##xxx;               \
                                                                        \
        if (symmetry)                                                   \
                for_each_rtd_cpu_dais(rtd, i, cpu_dai)                  \
-                       if (cpu_dai->name && cpu_dai->name != d.name) { \
+                       if (cpu_dai->xxx && cpu_dai->xxx != d.xxx) {    \
                                dev_err(rtd->dev, "ASoC: unmatched %s symmetry: %d - %d\n", \
-                                       #name, cpu_dai->name, d.name);  \
+                                       #xxx, cpu_dai->xxx, d.xxx);     \
                                return -EINVAL;                         \
                        }