summaryrefslogtreecommitdiff
path: root/sound/soc/soc-cache.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-21 17:19:56 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-21 23:17:18 +0000
commit68d44ee0bc70be30ea1ee936e6e21082193386cf (patch)
treef3b71694f3d9a6bf6a74b5ef3d3c0b6192c6287f /sound/soc/soc-cache.c
parentbe4fcddd17f01ede0ff46cf86c5ab8c5adb37175 (diff)
downloadlinux-3.10-68d44ee0bc70be30ea1ee936e6e21082193386cf.tar.gz
linux-3.10-68d44ee0bc70be30ea1ee936e6e21082193386cf.tar.bz2
linux-3.10-68d44ee0bc70be30ea1ee936e6e21082193386cf.zip
ASoC: Make LZO cache compression optional
Make LZO cache compression optional as it pulls in the kernel wide LZO implementation and rbtree compression is generally more efficient for typical register maps, especially in terms of CPU performance. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/soc-cache.c')
-rw-r--r--sound/soc/soc-cache.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index fc80be7dfd6..a9ebc078bea 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -988,6 +988,7 @@ static int snd_soc_rbtree_cache_init(struct snd_soc_codec *codec)
return 0;
}
+#ifdef CONFIG_SND_SOC_CACHE_LZO
struct snd_soc_lzo_ctx {
void *wmem;
void *dst;
@@ -1399,6 +1400,7 @@ err_tofree:
}
return ret;
}
+#endif
static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec)
{
@@ -1541,6 +1543,7 @@ static const struct snd_soc_cache_ops cache_types[] = {
.write = snd_soc_flat_cache_write,
.sync = snd_soc_flat_cache_sync
},
+#ifdef CONFIG_SND_SOC_CACHE_LZO
{
.id = SND_SOC_LZO_COMPRESSION,
.name = "LZO",
@@ -1550,6 +1553,7 @@ static const struct snd_soc_cache_ops cache_types[] = {
.write = snd_soc_lzo_cache_write,
.sync = snd_soc_lzo_cache_sync
},
+#endif
{
.id = SND_SOC_RBTREE_COMPRESSION,
.name = "rbtree",