Message ID | 1406807898-5927-35-git-send-email-broonie@kernel.org |
---|---|
State | New |
Headers | show
Return-Path: <patchwork-forward+bncBDQ2L75W5QGBB37N5CPAKGQE67ABP4I@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f71.google.com (mail-oi0-f71.google.com [209.85.218.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 274AF20792 for <linaro@patches.linaro.org>; Thu, 31 Jul 2014 12:30:40 +0000 (UTC) Received: by mail-oi0-f71.google.com with SMTP id e131sf11661258oig.2 for <linaro@patches.linaro.org>; Thu, 31 Jul 2014 05:30:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=VmyOcZeUOL8M4y6oZjb84cymR9wbzvloBmpSekdP1wg=; b=elgHBqW6WZWhDH7DxW6yYnZBXefe305wKDEtwYiy5j8uf6Wdh4TyB+O1tgH/3ZBTbW gq56svGyhzVG86P1LTvdTkQTSI7a/OEtuBDa7q2u53q6HH2QwY1/W9Fobtu0Mpu3xbmE geOmNUmYMWHieAcDv3mLQqhPMMo03HcRuoKn8BxgtC2iLkMjKuLUR64bg94oW0xRN3mu MoXlhN9johvTcfjpgto0FAZ1d3aInmxwiEIuSRCdKJEEK08LtxGOXLsjuZPkr/+dUXQI +NDHJOtKfIRTkOlP/TK1f6HD3ybiDe4Fx3NAIkfACxzvCgWwfpS9O18TIKyTIxrqLzCu xdXQ== X-Gm-Message-State: ALoCoQlY6gi5i/hXRcvWQBSgOZaSFz/ZRUR68q6C0x7dOGGLvtv4MWNpSaRNRLQRB9luIjtYcy8E X-Received: by 10.182.128.234 with SMTP id nr10mr1491127obb.0.1406809839782; Thu, 31 Jul 2014 05:30:39 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.98.175 with SMTP id o44ls884725qge.55.gmail; Thu, 31 Jul 2014 05:30:39 -0700 (PDT) X-Received: by 10.52.231.226 with SMTP id tj2mr14366600vdc.16.1406809839651; Thu, 31 Jul 2014 05:30:39 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id k8si4188652vdv.58.2014.07.31.05.30.39 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 05:30:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hq11so3982834vcb.24 for <patchwork-forward@linaro.org>; Thu, 31 Jul 2014 05:30:39 -0700 (PDT) X-Received: by 10.220.50.8 with SMTP id x8mr12303809vcf.18.1406809839527; Thu, 31 Jul 2014 05:30:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp14267vcb; Thu, 31 Jul 2014 05:30:38 -0700 (PDT) X-Received: by 10.194.89.138 with SMTP id bo10mr16542771wjb.22.1406809838281; Thu, 31 Jul 2014 05:30:38 -0700 (PDT) Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id av8si11067971wjc.57.2014.07.31.05.30.37 for <multiple recipients>; Thu, 31 Jul 2014 05:30:38 -0700 (PDT) Received-SPF: none (google.com: alsa-devel-bounces@alsa-project.org does not designate permitted sender hosts) client-ip=77.48.224.243; Received: by alsa0.perex.cz (Postfix, from userid 1000) id BDC0F2654FB; Thu, 31 Jul 2014 14:30:31 +0200 (CEST) Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 9A3AB2657AC; Thu, 31 Jul 2014 14:11:48 +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 E25FF2657A3; Thu, 31 Jul 2014 14:11:43 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id C83A326168D for <alsa-devel@alsa-project.org>; Thu, 31 Jul 2014 13:59:41 +0200 (CEST) Received: from cpc11-sgyl31-2-0-cust672.sgyl.cable.virginm.net ([94.175.94.161] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from <broonie@sirena.org.uk>) id 1XCp14-0004EH-M1; Thu, 31 Jul 2014 11:59:40 +0000 Received: from broonie by debutante with local (Exim 4.83) (envelope-from <broonie@sirena.org.uk>) id 1XCp0w-0001bj-1D; Thu, 31 Jul 2014 12:59:18 +0100 From: Mark Brown <broonie@kernel.org> To: Liam Girdwood <lgirdwood@gmail.com> Date: Thu, 31 Jul 2014 12:58:18 +0100 Message-Id: <1406807898-5927-35-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1406807898-5927-1-git-send-email-broonie@kernel.org> References: <1406807898-5927-1-git-send-email-broonie@kernel.org> X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mezzanine.sirena.org.uk X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.2 X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Cc: alsa-devel@alsa-project.org, linaro-kernel@lists.linaro.org, patches@opensource.wolfsonmicro.com, Mark Brown <broonie@linaro.org> Subject: [alsa-devel] [PATCH 35/35] ASoC: wm9713: Convert to params_width() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: broonie@kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit |
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 2a9c6d11330c..bddee30a4bc7 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -953,16 +953,16 @@ static int wm9713_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_soc_codec *codec = dai->codec; u16 reg = ac97_read(codec, AC97_CENTER_LFE_MASTER) & 0xfff3; - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S16_LE: + switch (params_width(params)) { + case 16: break; - case SNDRV_PCM_FORMAT_S20_3LE: + case 20: reg |= 0x0004; break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: reg |= 0x0008; break; - case SNDRV_PCM_FORMAT_S32_LE: + case 32: reg |= 0x000c; break; }