From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935687Ab1JFGNL (ORCPT ); Thu, 6 Oct 2011 02:13:11 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:42687 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933935Ab1JFGNK (ORCPT ); Thu, 6 Oct 2011 02:13:10 -0400 Subject: [PATCH 02/10] ASoC: wm8711: Convert to snd_soc_cache_sync From: Axel Lin To: linux-kernel@vger.kernel.org Cc: Mike Arthur , Mark Brown , Ian Lartey , Dimitris Papastamos , Liam Girdwood , alsa-devel@alsa-project.org In-Reply-To: <1317881417.13399.1.camel@phoenix> References: <1317881417.13399.1.camel@phoenix> Content-Type: text/plain; charset="UTF-8" Date: Thu, 06 Oct 2011 14:13:02 +0800 Message-ID: <1317881582.13399.5.camel@phoenix> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert to snd_soc_cache_sync for sync reg_cache with the hardware. Signed-off-by: Axel Lin --- sound/soc/codecs/wm8711.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c index 47c7fd5..b489edf 100644 --- a/sound/soc/codecs/wm8711.c +++ b/sound/soc/codecs/wm8711.c @@ -291,6 +291,7 @@ static int wm8711_set_dai_fmt(struct snd_soc_dai *codec_dai, static int wm8711_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { + int ret; u16 reg = snd_soc_read(codec, WM8711_PWR) & 0xff7f; switch (level) { @@ -300,6 +301,13 @@ static int wm8711_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_PREPARE: break; case SND_SOC_BIAS_STANDBY: + if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { + ret = snd_soc_cache_sync(codec); + if (ret < 0) { + dev_err(codec->dev, "Failed to sync cache: %d\n", ret); + return ret; + } + } snd_soc_write(codec, WM8711_PWR, reg | 0x0040); break; case SND_SOC_BIAS_OFF: @@ -346,18 +354,7 @@ static int wm8711_suspend(struct snd_soc_codec *codec, pm_message_t state) static int wm8711_resume(struct snd_soc_codec *codec) { - int i; - u8 data[2]; - u16 *cache = codec->reg_cache; - - /* Sync reg_cache with the hardware */ - for (i = 0; i < ARRAY_SIZE(wm8711_reg); i++) { - data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001); - data[1] = cache[i] & 0x00ff; - codec->hw_write(codec->control_data, data, 2); - } wm8711_set_bias_level(codec, SND_SOC_BIAS_STANDBY); - return 0; } -- 1.7.4.1