From patchwork Thu Jul 31 11:58:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 34603 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D858620792 for ; Thu, 31 Jul 2014 12:15:31 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id wp18sf10680871obc.9 for ; Thu, 31 Jul 2014 05:15:31 -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=sj/W1PpGiP9fdnCy60lfX4O2dEp4sc60BVzFVTD/L0A=; b=QoY3boQ4ZhyvyenwFj1ylxJSeDwlp19T8Bub5nTI7FiuvqL9xRRycwTBNFDFhQbMBR amGDOG8P+f2fBHTzlE7LCthXP3inMpFNYI/FS3AodCFltt9QzRMbNiM+cbxI26NPHJs8 du3HVTAdnuXF4cHPmU5LTfirLMhjIw6EXhQsTmIcuRanQErCRDha28tg+U73YLzH1wLu jlnMblyHk2p/IhMGwztMEWkVgFkxRijdp6PEphXb8jaIk7WjYSk1TlG2rIFNPPfIYQEQ zjuDYrSkvxFz/FCis5lI6n3RZvAf/hWjhVwQLIwVM1Y3tO+AxT8EXIPn+gir3SG0NHs7 Kebg== X-Gm-Message-State: ALoCoQkFHJpSgCqn/ZPhDPhfiDK4q4SWIooleQpC6y6ndI/7+ZhF0DmM0/9Uyqr3ErZHxxUXzhPv X-Received: by 10.182.27.35 with SMTP id q3mr1447826obg.34.1406808930717; Thu, 31 Jul 2014 05:15:30 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.13 with SMTP id f13ls991330qge.65.gmail; Thu, 31 Jul 2014 05:15:30 -0700 (PDT) X-Received: by 10.221.44.131 with SMTP id ug3mr12173448vcb.40.1406808930543; Thu, 31 Jul 2014 05:15:30 -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 o2si4143033vdb.104.2014.07.31.05.15.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 05:15:30 -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 la4so4000685vcb.37 for ; Thu, 31 Jul 2014 05:15:30 -0700 (PDT) X-Received: by 10.52.129.165 with SMTP id nx5mr14172215vdb.25.1406808930446; Thu, 31 Jul 2014 05:15:30 -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 tc5csp13326vcb; Thu, 31 Jul 2014 05:15:29 -0700 (PDT) X-Received: by 10.194.216.163 with SMTP id or3mr15701560wjc.31.1406808929175; Thu, 31 Jul 2014 05:15:29 -0700 (PDT) Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id gl17si21008681wic.35.2014.07.31.05.15.28 for ; Thu, 31 Jul 2014 05:15:28 -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 648332657EC; Thu, 31 Jul 2014 14:15:27 +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 BB7F82655F8; Thu, 31 Jul 2014 14:04:06 +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 669202655FC; Thu, 31 Jul 2014 14:04:05 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 8D93E265041 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 1XCp16-0004EG-5I; Thu, 31 Jul 2014 11:59:41 +0000 Received: from broonie by debutante with local (Exim 4.83) (envelope-from ) id 1XCp0w-0001bZ-03; Thu, 31 Jul 2014 12:59:18 +0100 From: Mark Brown To: Liam Girdwood Date: Thu, 31 Jul 2014 12:58:16 +0100 Message-Id: <1406807898-5927-33-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 33/35] ASoC: wm8995: 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/wm8995.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index 863a2c38bcb5..cae4ac5a5730 100644 --- a/sound/soc/codecs/wm8995.c +++ b/sound/soc/codecs/wm8995.c @@ -1597,21 +1597,21 @@ static int wm8995_hw_params(struct snd_pcm_substream *substream, return bclk_rate; aif1 = 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 |= (0x1 << WM8995_AIF1_WL_SHIFT); break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: aif1 |= (0x2 << WM8995_AIF1_WL_SHIFT); break; - case SNDRV_PCM_FORMAT_S32_LE: + case 32: aif1 |= (0x3 << WM8995_AIF1_WL_SHIFT); break; default: dev_err(dai->dev, "Unsupported word length %u\n", - params_format(params)); + params_width(params)); return -EINVAL; }