From patchwork Thu Jul 31 11:58:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 34615 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 97E0E20792 for ; Thu, 31 Jul 2014 12:22:05 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id eu11sf17014213pac.11 for ; Thu, 31 Jul 2014 05:22:04 -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=ca224SlxWvseOXtNoC7PX0TAdrwBbqSizCDOCpmd6DQ=; b=EYb+kmkjWC4I8ijKsj6ZmQpYdIiF4vK9acirktTXHFJx7TYl7YIfVqC63dq5GH4zRj DI71FgZF34cA4v2lIj834z/zqj3iA7dC0a2lEXbSxpDMTBxrKxLtb+7WLO/YbxrpHaj7 1gTf47USw5pBWubj0fgCfX6IiG9/ald4Nt0lokYMrZCOnXFTuteXsKYjgsC28cc/8zky zhq+lLqDpUBJTgucwdKzd4voetjaR+v8u4YOK/Wjoqsl+3n6C/7whbPoNA/dISli40k9 UBC3lJ4vcrUdDXG6Ow7VwGWvTJdNbhC2QDGnw1P5jx92+jW5oIdxVO2Umx5KJfVvyuzN T1LQ== X-Gm-Message-State: ALoCoQmoHdOC/hKBb8egZbCinyeF9T5MOiAyGi6aQBj6PpCm72H/kO6dWc4n2chRt1sgy3a14ZDC X-Received: by 10.66.231.68 with SMTP id te4mr1458430pac.29.1406809323814; Thu, 31 Jul 2014 05:22:03 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.36 with SMTP id k33ls935895qgf.79.gmail; Thu, 31 Jul 2014 05:22:03 -0700 (PDT) X-Received: by 10.52.231.226 with SMTP id tj2mr14303763vdc.16.1406809323685; Thu, 31 Jul 2014 05:22:03 -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 s5si4197822vcu.2.2014.07.31.05.22.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 05:22:03 -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 hq11so3994277vcb.38 for ; Thu, 31 Jul 2014 05:22:03 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr12307751vcb.0.1406809323615; Thu, 31 Jul 2014 05:22:03 -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 tc5csp13758vcb; Thu, 31 Jul 2014 05:22:03 -0700 (PDT) X-Received: by 10.180.92.104 with SMTP id cl8mr16237588wib.43.1406809322458; Thu, 31 Jul 2014 05:22:02 -0700 (PDT) Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id mc8si11008572wjb.66.2014.07.31.05.22.00 for ; Thu, 31 Jul 2014 05:22:01 -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 80FD326589C; Thu, 31 Jul 2014 14:21:58 +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 80487265661; Thu, 31 Jul 2014 14:05:35 +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 76E712654D4; Thu, 31 Jul 2014 14:05:21 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id B447D2654CD for ; Thu, 31 Jul 2014 13:59:44 +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 1XCp1E-0004EP-SQ; Thu, 31 Jul 2014 11:59:43 +0000 Received: from broonie by debutante with local (Exim 4.83) (envelope-from ) id 1XCp0v-0001aw-Qc; Thu, 31 Jul 2014 12:59:17 +0100 From: Mark Brown To: Liam Girdwood Date: Thu, 31 Jul 2014 12:58:08 +0100 Message-Id: <1406807898-5927-25-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 25/35] ASoC: wm8978: 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/wm8978.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index 28ef46c91f62..ee2ba574952b 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c @@ -736,16 +736,16 @@ static int wm8978_hw_params(struct snd_pcm_substream *substream, return -EINVAL; /* bit size */ - 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: iface_ctl |= 0x20; break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: iface_ctl |= 0x40; break; - case SNDRV_PCM_FORMAT_S32_LE: + case 32: iface_ctl |= 0x60; break; } @@ -817,8 +817,8 @@ static int wm8978_hw_params(struct snd_pcm_substream *substream, wm8978->sysclk == WM8978_MCLK ? ", consider using PLL" : ""); - dev_dbg(codec->dev, "%s: fmt %d, rate %u, MCLK divisor #%d\n", __func__, - params_format(params), params_rate(params), best); + dev_dbg(codec->dev, "%s: width %d, rate %u, MCLK divisor #%d\n", __func__, + params_width(params), params_rate(params), best); /* MCLK divisor mask = 0xe0 */ snd_soc_update_bits(codec, WM8978_CLOCKING, 0xe0, best << 5);