ASoC: soc-component: add snd_soc_component_is_codec()

Checking .non_legacy_dai_naming is not readable.
Let's add new snd_soc_component_is_codec().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87h7dft7dn.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 3a35d14..a431714 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -333,6 +333,11 @@ static inline int snd_soc_component_cache_sync(
        return regcache_sync(component->regmap);
 }
 
+static inline int snd_soc_component_is_codec(struct snd_soc_component *component)
+{
+       return component->driver->non_legacy_dai_naming;
+}
+
 void snd_soc_component_set_aux(struct snd_soc_component *component,
                               struct snd_soc_aux_dev *aux);
 int snd_soc_component_init(struct snd_soc_component *component);

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 39ba700..850e968 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -355,9 +355,9 @@ static int asoc_simple_init_dai_link_params(struct snd_soc_pcm_runtime *rtd,
        struct snd_pcm_hardware hw;
        int i, ret, stream;
 
-       /* Only codecs should have non_legacy_dai_naming set. */
+       /* Only Codecs */
        for_each_rtd_components(rtd, i, component) {
-               if (!component->driver->non_legacy_dai_naming)
+               if (!snd_soc_component_is_codec(component))
                        return 0;
        }
 

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index c830e96..beb3ac6 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1247,14 +1247,13 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
 
        /*
         * Flip the polarity for the "CPU" end of a CODEC<->CODEC link
-        * the component which has non_legacy_dai_naming is Codec
         */
        inv_dai_fmt = snd_soc_daifmt_clock_provider_fliped(dai_fmt);
 
        for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
                unsigned int fmt = dai_fmt;
 
-               if (cpu_dai->component->driver->non_legacy_dai_naming)
+               if (snd_soc_component_is_codec(cpu_dai->component))
                        fmt = inv_dai_fmt;
 
                ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
@@ -2521,7 +2520,7 @@ static int snd_soc_register_dais(struct snd_soc_component *component,
 
        for (i = 0; i < count; i++) {
                dai = snd_soc_register_dai(component, dai_drv + i, count == 1 &&
-                                 !component->driver->non_legacy_dai_naming);
+                                          !snd_soc_component_is_codec(component));
                if (dai == NULL) {
                        ret = -ENOMEM;
                        goto err;