Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-microblaze.git] / include / sound / soc-component.h

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 5a764c3..c26ffb0 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -179,7 +179,7 @@ struct snd_soc_component_driver {
         * analogue).
         */
        unsigned int endianness:1;
-       unsigned int non_legacy_dai_naming:1;
+       unsigned int legacy_dai_naming:1;
 
        /* this component uses topology and ignore machine driver FEs */
        const char *ignore_machine;
@@ -348,11 +348,6 @@ 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);