From patchwork Mon Jun 1 08:10:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 6518751 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9BCF69F1CC for ; Mon, 1 Jun 2015 08:13:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D479D204EC for ; Mon, 1 Jun 2015 08:13:35 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id CA28220142 for ; Mon, 1 Jun 2015 08:13:34 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id E8F94265182; Mon, 1 Jun 2015 10:13:33 +0200 (CEST) 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=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 7F320261493; Mon, 1 Jun 2015 10:11:24 +0200 (CEST) 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 AB312261469; Mon, 1 Jun 2015 10:11:22 +0200 (CEST) Received: from smtp-out-051.synserver.de (smtp-out-058.synserver.de [212.40.185.58]) by alsa0.perex.cz (Postfix) with ESMTP id 4352726050C for ; Mon, 1 Jun 2015 10:11:15 +0200 (CEST) Received: (qmail 25948 invoked by uid 0); 1 Jun 2015 08:11:13 -0000 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@metafoo.de X-SynServer-PPID: 25211 Received: from p4fde6303.dip0.t-ipconnect.de (HELO lars-laptop.analog.com) [79.222.99.3] by 217.119.54.96 with SMTP; 1 Jun 2015 08:11:13 -0000 From: Lars-Peter Clausen To: Mark Brown , Liam Girdwood Date: Mon, 1 Jun 2015 10:10:25 +0200 Message-Id: <1433146266-1599-6-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433146266-1599-1-git-send-email-lars@metafoo.de> References: <1433146266-1599-1-git-send-email-lars@metafoo.de> Cc: Brian Austin , alsa-devel@alsa-project.org, Charles Keepax , Paul Handrigan , Lars-Peter Clausen Subject: [alsa-devel] [PATCH 06/47] ASoC: wm0010: Replace direct snd_soc_codec dapm field access 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 The dapm field of the snd_soc_codec struct is eventually going to be removed, in preparation for this replace all manual access to codec->dapm.bias_level with snd_soc_codec_get_bias_level(). Signed-off-by: Lars-Peter Clausen --- sound/soc/codecs/wm0010.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index 3358dd6..6560a66 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -751,13 +751,13 @@ static int wm0010_set_bias_level(struct snd_soc_codec *codec, switch (level) { case SND_SOC_BIAS_ON: - if (codec->dapm.bias_level == SND_SOC_BIAS_PREPARE) + if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_PREPARE) wm0010_boot(codec); break; case SND_SOC_BIAS_PREPARE: break; case SND_SOC_BIAS_STANDBY: - if (codec->dapm.bias_level == SND_SOC_BIAS_PREPARE) { + if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_PREPARE) { mutex_lock(&wm0010->lock); wm0010_halt(codec); mutex_unlock(&wm0010->lock);