From patchwork Thu Jul 31 11:58:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 34616 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9C46520792 for ; Thu, 31 Jul 2014 12:22:34 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id ij19sf7995828vcb.8 for ; Thu, 31 Jul 2014 05:22:34 -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=wTCEDyaXqqMss5x7PUIU3w/8NMLjxDEoZ4fEB4fkHpc=; b=kLJ75OzUJuYCNC5B5AHqDT3ZHHvyK7BYYzLcnopccinGAEE5V3qB5dAbxLTwfeiU2I 7MhtpDSw9k9TAMCJtJBBBzEF0nDm0fozo9NSSIo5hKzKF39SJveE8bcpgiwfdpDHGuk6 8Bj/uQ75suggT/lDXDS9UpbF0T2C+iS0Acl4xCz3+lUHliSfJ09wgLXJbBQwvMSiDKoP B1BuN7znDeGhiWvcLHNGZhqriTPpkCOEbfjpTyWV2gWzPI4TlmWYttMqamcQaWBiFm/2 ph/oxbIsz8uSKT/5yGY+DivxiQhvGb7Rv7u9bjBOPc3TsqbanJQu8wqn4PYH8OBRRJs3 T1KA== X-Gm-Message-State: ALoCoQmorK+9rUzoj2alJ24nQVZwOecO8a66bRBVzOydEruxDcsm41qCi5HjU/8/di58F1k+1MF8 X-Received: by 10.236.168.101 with SMTP id j65mr1251838yhl.30.1406809354415; Thu, 31 Jul 2014 05:22:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.51.237 with SMTP id u100ls909646qga.36.gmail; Thu, 31 Jul 2014 05:22:34 -0700 (PDT) X-Received: by 10.220.12.78 with SMTP id w14mr10258940vcw.68.1406809354308; Thu, 31 Jul 2014 05:22:34 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id sc8si4192233veb.26.2014.07.31.05.22.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 05:22:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id hq11so4032701vcb.30 for ; Thu, 31 Jul 2014 05:22:34 -0700 (PDT) X-Received: by 10.52.244.138 with SMTP id xg10mr14240456vdc.40.1406809354202; Thu, 31 Jul 2014 05:22:34 -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 tc5csp13782vcb; Thu, 31 Jul 2014 05:22:33 -0700 (PDT) X-Received: by 10.194.84.69 with SMTP id w5mr16821458wjy.0.1406809352945; Thu, 31 Jul 2014 05:22:32 -0700 (PDT) Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id gh11si10940868wjc.151.2014.07.31.05.22.29 for ; Thu, 31 Jul 2014 05:22:29 -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 75B022658BB; Thu, 31 Jul 2014 14:22: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 43C76265667; Thu, 31 Jul 2014 14:05:36 +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 BD86326565B; Thu, 31 Jul 2014 14:05:29 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 0910D2654E9 for ; 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 ) id 1XCp1D-0004EN-LB; Thu, 31 Jul 2014 11:59:45 +0000 Received: from broonie by debutante with local (Exim 4.83) (envelope-from ) id 1XCp0v-0001b5-Rz; Thu, 31 Jul 2014 12:59:17 +0100 From: Mark Brown To: Liam Girdwood Date: Thu, 31 Jul 2014 12:58:10 +0100 Message-Id: <1406807898-5927-27-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 27/35] ASoC: wm8985: 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.171 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/wm8985.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index cbbdfbbd0a9f..ee380190399f 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -698,22 +698,22 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream, if ((int)wm8985->bclk < 0) return wm8985->bclk; - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S16_LE: + switch (params_width(params)) { + case 16: blen = 0x0; break; - case SNDRV_PCM_FORMAT_S20_3LE: + case 20: blen = 0x1; break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: blen = 0x2; break; - case SNDRV_PCM_FORMAT_S32_LE: + case 32: blen = 0x3; break; default: dev_err(dai->dev, "Unsupported word length %u\n", - params_format(params)); + params_width(params)); return -EINVAL; }