Message ID | 1406807898-5927-16-git-send-email-broonie@kernel.org |
---|---|
State | New |
Headers | show
Return-Path: <patchwork-forward+bncBDQ2L75W5QGBBYPH5CPAKGQEZXSMAIQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2890C20792 for <linaro@patches.linaro.org>; Thu, 31 Jul 2014 12:17:38 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rp18sf13481924iec.4 for <linaro@patches.linaro.org>; Thu, 31 Jul 2014 05:17:37 -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=o10ZEMcCwEbvUo879JNyx93JQ9WDL+N6k0CERnv3GYE=; b=ZSVuKu9bdDP8m4mPqIMNRFdMrro1X/Y3FBqFwe2h0ajQKgkT9wpfh0GOMn6JIZvq6K 2Wqf6goAZLNDY+8bvaPSwNLUGh4FMBir28jL2OWF3WzWhojEH2DkFz0spVY1IWBmYbFx BHNTgfzWXjvyVgTY8WgPooSb/3b2R8cxl1+awjOg50UgYP4kRdLUOIjI3Ph6iZmmDxCO I/umnI32FWSlYc22vsdUzEoSrWmX3pPor6Eil7g7VIqga/nKdTrXhzGhn06NIXAmqk7M mm4TerDx8nOlztMnRmmMdQylf9w08MHGud5id6fIJW3mNxbWKYG4QCqAo3Ll4bdRqpdX W56g== X-Gm-Message-State: ALoCoQmYzWNycEGoF+8GF7BKuG3jWW5UFTN91IneCwtQOLJlY3Q/7Cra7TKewnB6/KasnRGVG68a X-Received: by 10.50.50.130 with SMTP id c2mr4883120igo.4.1406809057688; Thu, 31 Jul 2014 05:17:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.35.232 with SMTP id n95ls919209qgn.23.gmail; Thu, 31 Jul 2014 05:17:37 -0700 (PDT) X-Received: by 10.220.175.70 with SMTP id w6mr1547306vcz.72.1406809057534; Thu, 31 Jul 2014 05:17:37 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id q6si1398107vcj.64.2014.07.31.05.17.37 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 05:17:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id la4so4048353vcb.19 for <patchwork-forward@linaro.org>; Thu, 31 Jul 2014 05:17:37 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr12267173vcb.0.1406809057424; Thu, 31 Jul 2014 05:17:37 -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 tc5csp13480vcb; Thu, 31 Jul 2014 05:17:36 -0700 (PDT) X-Received: by 10.194.142.148 with SMTP id rw20mr15907548wjb.69.1406809055289; Thu, 31 Jul 2014 05:17:35 -0700 (PDT) Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id gq8si10973136wjc.76.2014.07.31.05.17.31 for <multiple recipients>; Thu, 31 Jul 2014 05:17:32 -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 E0B8F265620; Thu, 31 Jul 2014 14:17:28 +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 B3C322655F0; Thu, 31 Jul 2014 14:04:50 +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 7035A265636; Thu, 31 Jul 2014 14:04:47 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 871EB26546C for <alsa-devel@alsa-project.org>; Thu, 31 Jul 2014 13:59:43 +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 1XCp0y-0004EU-Ff; Thu, 31 Jul 2014 11:59:42 +0000 Received: from broonie by debutante with local (Exim 4.83) (envelope-from <broonie@sirena.org.uk>) id 1XCp0v-0001aB-Ir; 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:57:59 +0100 Message-Id: <1406807898-5927-16-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 16/35] ASoC: wm8903: 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.174 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/wm8903.c b/sound/soc/codecs/wm8903.c index ec3250daa93e..aa0984864e76 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -1476,19 +1476,19 @@ static int wm8903_hw_params(struct snd_pcm_substream *substream, aif1 &= ~WM8903_AIF_WL_MASK; bclk = 2 * fs; - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S16_LE: + switch (params_width(params)) { + case 16: bclk *= 16; break; - case SNDRV_PCM_FORMAT_S20_3LE: + case 20: bclk *= 20; aif1 |= 0x4; break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: bclk *= 24; aif1 |= 0x8; break; - case SNDRV_PCM_FORMAT_S32_LE: + case 32: bclk *= 32; aif1 |= 0xc; break;