Message ID | 1406807898-5927-24-git-send-email-broonie@kernel.org |
---|---|
State | New |
Headers | show
Return-Path: <patchwork-forward+bncBDQ2L75W5QGBBY7K5CPAKGQEP2S33OI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 16B9D20792 for <linaro@patches.linaro.org>; Thu, 31 Jul 2014 12:24:04 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id f73sf9329442yha.3 for <linaro@patches.linaro.org>; Thu, 31 Jul 2014 05:24:03 -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=nbelZTDQxTwG8jPjTidotT93oNq6OZStRmgBGmpf2SE=; b=Yp3UGVhpONzzC0Vtg4u5wHdQHM8KlABMbAg76WK6iJHUaBrSSgJI6UBI6id0ZOKzMu x12zKrxJSTqtSt3Fb0NaqZWO58EujUgtecSbPmjn9YPXQnOQl7BFa5KQT1eeAvhoczVH xo4l/dxZ2EU2j4dRRJeG/ZtfHMiiM4p5vkZ1WIIBXHYNPWQrV3AwyUdF56ijh5dX+ux4 Qq+6f7rMoVm/5WV5cXNNDV3m3zR0wjdWIvpKtYBqShFdA6S+K7vFMc7mpAIqeJaV2JGG J6A+RJeMU5da0Ot5AMYe8zfgGP7FdaRfIOeBZLdSEDj7Vz24cOnewkulhj4bQ7S5DE8y b5dA== X-Gm-Message-State: ALoCoQlgFvMNjsDYO1deSOyxDwUmed0XTVkcEEPoDI1Nr3lw1FxMszR9oXtz/yZrvMTLjVloiRUU X-Received: by 10.236.180.202 with SMTP id j50mr1338691yhm.51.1406809443926; Thu, 31 Jul 2014 05:24:03 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.228 with SMTP id j91ls890672qgf.31.gmail; Thu, 31 Jul 2014 05:24:03 -0700 (PDT) X-Received: by 10.220.15.8 with SMTP id i8mr12130921vca.45.1406809443784; Thu, 31 Jul 2014 05:24:03 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id ss10si4168485vcb.92.2014.07.31.05.24.02 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 05:24:02 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id la4so4001135vcb.23 for <patchwork-forward@linaro.org>; Thu, 31 Jul 2014 05:24:02 -0700 (PDT) X-Received: by 10.52.144.14 with SMTP id si14mr187137vdb.95.1406809442624; Thu, 31 Jul 2014 05:24:02 -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 tc5csp13859vcb; Thu, 31 Jul 2014 05:24:02 -0700 (PDT) X-Received: by 10.180.24.66 with SMTP id s2mr16140446wif.33.1406809441529; Thu, 31 Jul 2014 05:24:01 -0700 (PDT) Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id bd5si11814546wib.19.2014.07.31.05.23.58 for <multiple recipients>; Thu, 31 Jul 2014 05:23:59 -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 32C232658E8; Thu, 31 Jul 2014 14:23:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled version=3.2.4 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 6F9A426567B; Thu, 31 Jul 2014 14:06:12 +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 A99652654EA; Thu, 31 Jul 2014 14:06:10 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id B1CF82654EC for <alsa-devel@alsa-project.org>; Thu, 31 Jul 2014 13:59:47 +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 1XCp1F-0004ES-J9; Thu, 31 Jul 2014 11:59:45 +0000 Received: from broonie by debutante with local (Exim 4.83) (envelope-from <broonie@sirena.org.uk>) id 1XCp0v-0001ar-P7; Thu, 31 Jul 2014 12:59:17 +0100 From: Mark Brown <broonie@kernel.org> To: Liam Girdwood <lgirdwood@gmail.com> Date: Thu, 31 Jul 2014 12:58:07 +0100 Message-Id: <1406807898-5927-24-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-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 24/35] ASoC: wm8974: 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.178 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/wm8974.c b/sound/soc/codecs/wm8974.c index 0627c56fa44e..682e9eda1019 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -445,16 +445,16 @@ static int wm8974_pcm_hw_params(struct snd_pcm_substream *substream, u16 adn = snd_soc_read(codec, WM8974_ADD) & 0x1f1; /* bit size */ - 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: iface |= 0x0020; break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: iface |= 0x0040; break; - case SNDRV_PCM_FORMAT_S32_LE: + case 32: iface |= 0x0060; break; }