From patchwork Sat Feb 22 17:34:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 3701741 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1026C9F382 for ; Sat, 22 Feb 2014 17:34:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 19381201BF for ; Sat, 22 Feb 2014 17:34:47 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 960E520145 for ; Sat, 22 Feb 2014 17:34:45 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 7E474261B2F; Sat, 22 Feb 2014 18:34:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 11B99261B11; Sat, 22 Feb 2014 18:34:34 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id D5F67261B28; Sat, 22 Feb 2014 18:34:32 +0100 (CET) Received: from smtp-out-015.synserver.de (smtp-out-131.synserver.de [212.40.185.131]) by alsa0.perex.cz (Postfix) with ESMTP id D8E1A261B0C for ; Sat, 22 Feb 2014 18:34:25 +0100 (CET) Received: (qmail 9856 invoked by uid 0); 22 Feb 2014 17:34:25 -0000 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@metafoo.de X-SynServer-PPID: 9812 Received: from ppp-46-244-149-120.dynamic.mnet-online.de (HELO lars-adi-laptop.fritz.box) [46.244.149.120] by 217.119.54.73 with SMTP; 22 Feb 2014 17:34:25 -0000 From: Lars-Peter Clausen To: Mark Brown , Liam Girdwood Date: Sat, 22 Feb 2014 18:34:45 +0100 Message-Id: <1393090485-10894-1-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 1.8.0 Cc: Adam Thomson , Lars-Peter Clausen , Michal Hajduk , alsa-devel@alsa-project.org Subject: [alsa-devel] [PATCH] ASoC: da732x: Use da732x->regmap instead of codec->control_data X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP With the ongoing component-ization of the ASoC framework and the continuing migration to using regmap for IO the control_data field of the snd_soc_codec struct will eventually be removed. Prepare the da732x driver for this by using da732x->regmap instead of accessing the CODEC's control_data field. Signed-off-by: Lars-Peter Clausen Acked-by: Adam Thomson --- sound/soc/codecs/da732x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index f295b65..54db45d 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c @@ -1487,8 +1487,8 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec, da732x_hp_dc_offset_cancellation(codec); - regcache_cache_only(codec->control_data, false); - regcache_sync(codec->control_data); + regcache_cache_only(da732x->regmap, false); + regcache_sync(da732x->regmap); } else { snd_soc_update_bits(codec, DA732X_REG_BIAS_EN, DA732X_BIAS_BOOST_MASK, @@ -1499,7 +1499,7 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec, } break; case SND_SOC_BIAS_OFF: - regcache_cache_only(codec->control_data, true); + regcache_cache_only(da732x->regmap, true); da732x_set_charge_pump(codec, DA732X_DISABLE_CP); snd_soc_update_bits(codec, DA732X_REG_BIAS_EN, DA732X_BIAS_EN, DA732X_BIAS_DIS);