From patchwork Thu Jul 31 11:58:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 34602 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f197.google.com (mail-ig0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3166A20792 for ; Thu, 31 Jul 2014 12:14:45 +0000 (UTC) Received: by mail-ig0-f197.google.com with SMTP id r2sf11733768igi.8 for ; Thu, 31 Jul 2014 05:14:44 -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=2ivlY5WWRmGgXO5fKvX4b1megkj3hxRRMOfjVHzNuiY=; b=CZMHwCQWvYM8bRl6nBy8H8gBb8MUqYOn+iztKzmzXGv+fY8sPLopKyZYQ/Sw5JbfPh QeXmEokphjhrOICFyiPCA5gBGAX48ZWGW9d7H9FktMz/HThht/Qb4yV2YUYc1UC9Q2WG +URe7Iz/vtp239OdukcpuLboeKDLsV1iq91QYpdwEw/CZCpQysPCP3wm1FUHBu0PJQMH ta9lQU+iYhuFrahqfOgOrPfJ2hVBATWyWSBvn+E7YbS4Ty5LfnUPaFFoKbN6vOlotb2+ +eRxHVdXqpXILT7KqhfZsxSXrWySV3Whez0XjANSlITRFYHsQfVkPnP/ReEcbLNpKH3P zb/A== X-Gm-Message-State: ALoCoQlFCuOmE6Pss6FqfEC12LmEYJi0veEp05VHdOqcQBbFy8tNU1B0gaErjnDhKnM44Xklh55f X-Received: by 10.50.57.111 with SMTP id h15mr4860171igq.3.1406808884742; Thu, 31 Jul 2014 05:14:44 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.102.246 with SMTP id w109ls910404qge.4.gmail; Thu, 31 Jul 2014 05:14:44 -0700 (PDT) X-Received: by 10.52.148.2 with SMTP id to2mr14183086vdb.38.1406808884613; Thu, 31 Jul 2014 05:14:44 -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 qx9si4151427vcb.93.2014.07.31.05.14.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 05:14:44 -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 la4so3982168vcb.23 for ; Thu, 31 Jul 2014 05:14:44 -0700 (PDT) X-Received: by 10.52.144.14 with SMTP id si14mr116898vdb.95.1406808884189; Thu, 31 Jul 2014 05:14:44 -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 tc5csp13271vcb; Thu, 31 Jul 2014 05:14:43 -0700 (PDT) X-Received: by 10.194.87.97 with SMTP id w1mr16538798wjz.42.1406808883297; Thu, 31 Jul 2014 05:14:43 -0700 (PDT) Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id ho6si11718971wib.63.2014.07.31.05.14.42 for ; Thu, 31 Jul 2014 05:14:42 -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 4B72B2655B4; Thu, 31 Jul 2014 14:14:41 +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 2D9952655CE; Thu, 31 Jul 2014 14:03:55 +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 B19B02655CE; Thu, 31 Jul 2014 14:03:53 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 5D9A1264F1D for ; Thu, 31 Jul 2014 13:59:42 +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 ) id 1XCp0y-0004EW-EZ; Thu, 31 Jul 2014 11:59:41 +0000 Received: from broonie by debutante with local (Exim 4.83) (envelope-from ) id 1XCp0v-0001aM-KR; Thu, 31 Jul 2014 12:59:17 +0100 From: Mark Brown To: Liam Girdwood Date: Thu, 31 Jul 2014 12:58:01 +0100 Message-Id: <1406807898-5927-18-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 Subject: [alsa-devel] [PATCH 18/35] ASoC: wm8940: Convert to params_width() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: 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-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 From: Mark Brown The CODEC doesn't care how data is laid out in memory. Signed-off-by: Mark Brown --- sound/soc/codecs/wm8940.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index fc6eec9ad66b..52011043e54c 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -430,19 +430,19 @@ static int wm8940_i2s_hw_params(struct snd_pcm_substream *substream, if (ret) goto error_ret; - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S8: + switch (params_width(params)) { + case 8: companding = companding | (1 << 5); break; - case SNDRV_PCM_FORMAT_S16_LE: + case 16: break; - case SNDRV_PCM_FORMAT_S20_3LE: + case 20: iface |= (1 << 5); break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: iface |= (2 << 5); break; - case SNDRV_PCM_FORMAT_S32_LE: + case 32: iface |= (3 << 5); break; }