From patchwork Thu Jul 31 12:02:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 34622 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 E4B5F20792 for ; Thu, 31 Jul 2014 12:32:56 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id ij19sf8042373vcb.8 for ; Thu, 31 Jul 2014 05:32:56 -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=FzkdG9x6BEnvZnhAEP07V1LSnLil6HBXjlGLhs6Y1w0=; b=KU03p+HW5jMpgFodybtykXOEQQAKJkY9h0vmft2OfIZqrwV1V1yuYwo0szLPLcoZpo R20xQkNeZmObJr+t5T3WuZFjIYyekQ9xnZ+YgENSpLMJOtL9tW476immrAkrRwl2CEUF 7rtcpGYH7rvvUsgnYi0Z4LDFiUlWvQr2UT9vt3tO+rwqxtzkn7IbGM8pAg5ESPMc0Quf dF0XIfjv6mEv3qBo+WQiUhkWQZijdVary7CzAJrkrb/wtvp8Ui8356Ntok/nfFFzvMqx F5oLY/4QFV0GE/9Ozt2Bdws9fkRIWUmufd5r0+xSrqPJ4/SEyNMCC0upBj/Q133QjltP IZsA== X-Gm-Message-State: ALoCoQkjsTA5eRp8dxopF8K0sUOjRSWjVulG+B3Gkv2/VFaOH9m1LTRV2raRQAbxN0ALXKdSB9D8 X-Received: by 10.52.231.97 with SMTP id tf1mr5575977vdc.3.1406809976654; Thu, 31 Jul 2014 05:32:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.38 with SMTP id j35ls1031641qge.89.gmail; Thu, 31 Jul 2014 05:32:56 -0700 (PDT) X-Received: by 10.220.50.8 with SMTP id x8mr12324071vcf.18.1406809976579; Thu, 31 Jul 2014 05:32:56 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id cl4si306468vdb.78.2014.07.31.05.32.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 05:32:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id id10so4026512vcb.7 for ; Thu, 31 Jul 2014 05:32:56 -0700 (PDT) X-Received: by 10.52.144.14 with SMTP id si14mr252098vdb.95.1406809976479; Thu, 31 Jul 2014 05:32:56 -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 tc5csp14436vcb; Thu, 31 Jul 2014 05:32:55 -0700 (PDT) X-Received: by 10.180.39.73 with SMTP id n9mr15646739wik.70.1406809975288; Thu, 31 Jul 2014 05:32:55 -0700 (PDT) Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id fb20si11066975wjc.71.2014.07.31.05.32.54 for ; Thu, 31 Jul 2014 05:32:55 -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 DE07C265556; Thu, 31 Jul 2014 14:32:53 +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 EE5A72655AF; Thu, 31 Jul 2014 14:13:40 +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 A97082655B0; Thu, 31 Jul 2014 14:13:39 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 9F1DD2655AF for ; Thu, 31 Jul 2014 14:02:36 +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 1XCp42-0004Jd-SY; Thu, 31 Jul 2014 12:02:35 +0000 Received: from broonie by debutante with local (Exim 4.83) (envelope-from ) id 1XCp40-0002Le-3h; Thu, 31 Jul 2014 13:02:28 +0100 From: Mark Brown To: Liam Girdwood Date: Thu, 31 Jul 2014 13:02:20 +0100 Message-Id: <1406808143-8985-2-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1406808143-8985-1-git-send-email-broonie@kernel.org> References: <1406808143-8985-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, Mark Brown Subject: [alsa-devel] [PATCH 2/5] ASoC: sta32x: 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.176 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/sta32x.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c index 0579d187135b..48740855566d 100644 --- a/sound/soc/codecs/sta32x.c +++ b/sound/soc/codecs/sta32x.c @@ -678,15 +678,11 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream, confb = snd_soc_read(codec, STA32X_CONFB); confb &= ~(STA32X_CONFB_SAI_MASK | STA32X_CONFB_SAIFB); - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S24_LE: - case SNDRV_PCM_FORMAT_S24_BE: - case SNDRV_PCM_FORMAT_S24_3LE: - case SNDRV_PCM_FORMAT_S24_3BE: + switch (params_width(params)) { + case 24: pr_debug("24bit\n"); /* fall through */ - case SNDRV_PCM_FORMAT_S32_LE: - case SNDRV_PCM_FORMAT_S32_BE: + case 32: pr_debug("24bit or 32bit\n"); switch (sta32x->format) { case SND_SOC_DAIFMT_I2S: @@ -701,8 +697,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream, } break; - case SNDRV_PCM_FORMAT_S20_3LE: - case SNDRV_PCM_FORMAT_S20_3BE: + case 20: pr_debug("20bit\n"); switch (sta32x->format) { case SND_SOC_DAIFMT_I2S: @@ -717,8 +712,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream, } break; - case SNDRV_PCM_FORMAT_S18_3LE: - case SNDRV_PCM_FORMAT_S18_3BE: + case 18: pr_debug("18bit\n"); switch (sta32x->format) { case SND_SOC_DAIFMT_I2S: @@ -733,8 +727,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream, } break; - case SNDRV_PCM_FORMAT_S16_LE: - case SNDRV_PCM_FORMAT_S16_BE: + case 16: pr_debug("16bit\n"); switch (sta32x->format) { case SND_SOC_DAIFMT_I2S: