ASoC: soc-cache: Ensure consistent cache naming

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 3eb92ef6c83f5de38d1a39eab524810fddd4a584..9e593cf1440b91f87571acee39b737cccb47e0bd 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -256,7 +256,7 @@ enum snd_soc_control_type {
 };
 
 enum snd_soc_compress_type {
-       SND_SOC_NO_COMPRESSION,
+       SND_SOC_FLAT_COMPRESSION,
        SND_SOC_LZO_COMPRESSION,
        SND_SOC_RBTREE_COMPRESSION
 };

diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index e5b18889a493c1787b8579fee12470e8bc4f2129..9b1ba33e6fe9d52d0cd449053660ef343877f41d 100644 (file)
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -1520,7 +1520,7 @@ static int snd_soc_flat_cache_init(struct snd_soc_codec *codec)
 /* an array of all supported compression types */
 static const struct snd_soc_cache_ops cache_types[] = {
        {
-               .id = SND_SOC_NO_COMPRESSION,
+               .id = SND_SOC_FLAT_COMPRESSION,
                .init = snd_soc_flat_cache_init,
                .exit = snd_soc_flat_cache_exit,
                .read = snd_soc_flat_cache_read,