ASoC: Suppress restore of default register values for rbtree cache sync
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 3 Jun 2011 15:36:30 +0000 (16:36 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 8 Jun 2011 14:24:36 +0000 (15:24 +0100)
Currently the rbtree code will write out the entire register map when
doing a cache sync which is wasteful and will slow things down. Check
to see if the value we're about to write is the default and don't bother
restoring it if it is, either the value will have been retained or the
device will have been reset and holds the value already.

We should really store the defaults in the nodes but this resolves the
immediate issue.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
sound/soc/soc-cache.c

index cad70c9640dc70e39aaa9c5f2d02a2224ba705fe..9a88a276a0abbae8d87bc192de71621988bf0266 100644 (file)
@@ -610,7 +610,7 @@ static int snd_soc_rbtree_cache_sync(struct snd_soc_codec *codec)
        struct rb_node *node;
        struct snd_soc_rbtree_node *rbnode;
        unsigned int regtmp;
-       unsigned int val;
+       unsigned int val, def;
        int ret;
        int i;
 
@@ -622,6 +622,11 @@ static int snd_soc_rbtree_cache_sync(struct snd_soc_codec *codec)
                        WARN_ON(codec->writable_register &&
                                codec->writable_register(codec, regtmp));
                        val = snd_soc_rbtree_get_register(rbnode, i);
+                       def = snd_soc_get_cache_val(codec->reg_def_copy, i,
+                                                   rbnode->word_size);
+                       if (val == def)
+                               continue;
+
                        codec->cache_bypass = 1;
                        ret = snd_soc_write(codec, regtmp, val);
                        codec->cache_bypass = 0;