From 27ea917fefa1ad3a0eaa83b96f449a3b8e55558e Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 21 Jan 2012 15:36:30 +0000 Subject: [PATCH] --- yaml --- r: 293217 b: refs/heads/master c: 8b71d441f75d180d3174b2e1b649db385552c266 h: refs/heads/master i: 293215: 45789d138b655513de238515e42e87cca5a87613 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8985.c | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/[refs] b/[refs] index 934d99da85ad..c0d478b77c9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb8f7693df0426b3c7aa6e6e401486962a033d5e +refs/heads/master: 8b71d441f75d180d3174b2e1b649db385552c266 diff --git a/trunk/sound/soc/codecs/wm8985.c b/trunk/sound/soc/codecs/wm8985.c index ee3aba3098cd..297119ffec68 100644 --- a/trunk/sound/soc/codecs/wm8985.c +++ b/trunk/sound/soc/codecs/wm8985.c @@ -834,25 +834,6 @@ static int wm8985_set_sysclk(struct snd_soc_dai *dai, return 0; } -static void wm8985_sync_cache(struct snd_soc_codec *codec) -{ - short i; - u16 *cache; - - if (!codec->cache_sync) - return; - codec->cache_only = 0; - /* restore cache */ - cache = codec->reg_cache; - for (i = 0; i < codec->driver->reg_cache_size; i++) { - if (i == WM8985_SOFTWARE_RESET - || cache[i] == wm8985_reg_defs[i]) - continue; - snd_soc_write(codec, i, cache[i]); - } - codec->cache_sync = 0; -} - static int wm8985_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { @@ -879,7 +860,7 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec, return ret; } - wm8985_sync_cache(codec); + snd_soc_cache_sync(codec); /* enable anti-pop features */ snd_soc_update_bits(codec, WM8985_OUT4_TO_ADC,