From patchwork Thu Jul 31 11:58:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 34611 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A215620792 for ; Thu, 31 Jul 2014 12:20:06 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id le20sf7998306vcb.1 for ; Thu, 31 Jul 2014 05:20:06 -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=Wz93dfJHACgkS2sdtHPhZFmBBkNglv4/gn+UjV7rJFM=; b=jKcXB2fOAdXel2iF/CDaafZYYrUi/Q3A+niYNw+yLG6dySIvKILqdRJlP5YFkYnwDz 4fLW6m7NOopgXCTgkOWeVpe0QMK53scjbNfHrLOFWlzi4m5slu3eA6FPaB3qNoPIdzjg whbfhlSG6WTPth5h40dsLGhVoSTDeGVupdtjl/aIiO2tl6kPp42IE2WnJpmyxJMNAUmt +5nZMhAhDGiPHejL5tTd/zANNhcdDj4wesTMmHPAQw1EM9QRcQuM+bwu7rnwIIZfmlc/ AtNEHXKdlidv3CrlfkZFaktDUncJlYDamajZtbVoSLkGgF+GKKqKU21VT+TnKJopcyNj +Lwg== X-Gm-Message-State: ALoCoQnKhoLH/ID+sRuB/qVYS9bNIjnGmtIZ4E0+hMT2Fgh9LYgxE7NsUKihIfrN4HxknmsEQUsT X-Received: by 10.236.175.42 with SMTP id y30mr1229275yhl.42.1406809206360; Thu, 31 Jul 2014 05:20:06 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.82.35 with SMTP id g32ls851913qgd.53.gmail; Thu, 31 Jul 2014 05:20:06 -0700 (PDT) X-Received: by 10.221.24.135 with SMTP id re7mr12024867vcb.53.1406809206239; Thu, 31 Jul 2014 05:20:06 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id iy1si4182991vdb.5.2014.07.31.05.20.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 05:20:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id im17so4059180vcb.3 for ; Thu, 31 Jul 2014 05:20:06 -0700 (PDT) X-Received: by 10.220.15.8 with SMTP id i8mr12095022vca.45.1406809206143; Thu, 31 Jul 2014 05:20:06 -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 tc5csp13640vcb; Thu, 31 Jul 2014 05:20:05 -0700 (PDT) X-Received: by 10.194.200.3 with SMTP id jo3mr16528921wjc.110.1406809205244; Thu, 31 Jul 2014 05:20:05 -0700 (PDT) Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id qn3si10910034wjc.167.2014.07.31.05.19.59 for ; Thu, 31 Jul 2014 05:20:00 -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 E1087265831; Thu, 31 Jul 2014 14:19: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 DD05726564F; Thu, 31 Jul 2014 14:05:24 +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 0619526564D; Thu, 31 Jul 2014 14:05:19 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id B891E2654D3 for ; Thu, 31 Jul 2014 13:59:45 +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 1XCp19-0004EI-Pv; Thu, 31 Jul 2014 11:59:43 +0000 Received: from broonie by debutante with local (Exim 4.83) (envelope-from ) id 1XCp0v-0001bV-Vi; Thu, 31 Jul 2014 12:59:17 +0100 From: Mark Brown To: Liam Girdwood Date: Thu, 31 Jul 2014 12:58:15 +0100 Message-Id: <1406807898-5927-32-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 32/35] ASoC: wm8994: 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.172 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/wm8994.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 39d8df040116..6cc0566dc29a 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2815,19 +2815,19 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream, } bclk_rate = params_rate(params); - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S16_LE: + switch (params_width(params)) { + case 16: bclk_rate *= 16; break; - case SNDRV_PCM_FORMAT_S20_3LE: + case 20: bclk_rate *= 20; aif1 |= 0x20; break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: bclk_rate *= 24; aif1 |= 0x40; break; - case SNDRV_PCM_FORMAT_S32_LE: + case 32: bclk_rate *= 32; aif1 |= 0x60; break; @@ -2966,16 +2966,16 @@ static int wm8994_aif3_hw_params(struct snd_pcm_substream *substream, return 0; } - 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: aif1 |= 0x20; break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: aif1 |= 0x40; break; - case SNDRV_PCM_FORMAT_S32_LE: + case 32: aif1 |= 0x60; break; default: