From patchwork Thu Jul 31 11:57:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 34600 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 46F9920792 for ; Thu, 31 Jul 2014 12:12:14 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id a1sf1718668wgh.6 for ; Thu, 31 Jul 2014 05:12:13 -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=wZkFacMnGsxDTrZUOtTqrgOwb917qYsrRy5N9UWiLcQ=; b=AuAa/eNEfWkCoCQaqNeEQ7qfqxq88Awojn2NZa8oFwMBdoB7Y+HNCoOYzu9rm1wkaB rJ9TEr3oMOV/EdSWqFy+4AGeV6L1X/zeC5jSa8og5E3sU4elKL8MyAWO3ggH//ODc3oq D6Xx6VCbKDCQqyWiDrcS1g9nt8K7AzKmPlogEQjJgLoIrKQ14zakjVTo0m9QPBtfEQxx 3NBZDzhGY7hPOwq9eElZY5NkxdD8rJ07ywpIuxZT9bFWqwCvVhtVvrtbDRGNRcOwuKot 0xTMleId6hnRAPTp53gpvQZVaEMrT9jKnnBa5JG8xlbwD2ROYYXS2eIzge9AhjdBHCR0 Ev+Q== X-Gm-Message-State: ALoCoQncf1r48xfPM2LTRHMPcR0+OXRGZLBdSuNePX1MwY09LT8cPL8BDgyAaAbVvg5EyQmBLrrz X-Received: by 10.112.11.165 with SMTP id r5mr385725lbb.24.1406808733190; Thu, 31 Jul 2014 05:12:13 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.198 with SMTP id 64ls915098qgn.8.gmail; Thu, 31 Jul 2014 05:12:13 -0700 (PDT) X-Received: by 10.52.69.172 with SMTP id f12mr14561184vdu.9.1406808732945; Thu, 31 Jul 2014 05:12:12 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id 16si4138609vdd.92.2014.07.31.05.12.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 05:12:11 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hq11so3974344vcb.38 for ; Thu, 31 Jul 2014 05:12:11 -0700 (PDT) X-Received: by 10.220.131.207 with SMTP id y15mr1497024vcs.71.1406808731750; Thu, 31 Jul 2014 05:12:11 -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 tc5csp13085vcb; Thu, 31 Jul 2014 05:12:11 -0700 (PDT) X-Received: by 10.180.101.129 with SMTP id fg1mr16447761wib.20.1406808730582; Thu, 31 Jul 2014 05:12:10 -0700 (PDT) Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id ck1si11735139wib.31.2014.07.31.05.12.09 for ; Thu, 31 Jul 2014 05:12:09 -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 5D8B42657C2; Thu, 31 Jul 2014 14:12:02 +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 9F031265589; Thu, 31 Jul 2014 14:00:08 +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 57D59265556; Thu, 31 Jul 2014 14:00:01 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 4958B265268 for ; Thu, 31 Jul 2014 13:59:39 +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-0004ET-DD; Thu, 31 Jul 2014 11:59:38 +0000 Received: from broonie by debutante with local (Exim 4.83) (envelope-from ) id 1XCp0v-0001a6-I5; Thu, 31 Jul 2014 12:59:17 +0100 From: Mark Brown To: Liam Girdwood Date: Thu, 31 Jul 2014 12:57:58 +0100 Message-Id: <1406807898-5927-15-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 15/35] ASoC: wm8900: 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.179 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/wm8900.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index d09fdce57f5a..44a5f1511f0f 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c @@ -640,16 +640,16 @@ static int wm8900_hw_params(struct snd_pcm_substream *substream, reg = snd_soc_read(codec, WM8900_REG_AUDIO1) & ~0x60; - 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: reg |= 0x20; break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: reg |= 0x40; break; - case SNDRV_PCM_FORMAT_S32_LE: + case 32: reg |= 0x60; break; default: