From patchwork Thu Jul 31 12:25:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 34639 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f199.google.com (mail-yk0-f199.google.com [209.85.160.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 12BEE20792 for ; Thu, 31 Jul 2014 12:53:58 +0000 (UTC) Received: by mail-yk0-f199.google.com with SMTP id 79sf5198820ykr.10 for ; Thu, 31 Jul 2014 05:53:57 -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=vWZCQrBUQUiD9FkVpLqfmM1JApLy/6N0xt6mVLtu1FQ=; b=k+yY0MLgoZExROQuNiFS2Z5hAK6Y8aMqa4c8wkzLz8OVEaTH/qRVw7IvFxWOfy8FM4 4UQ+i0ZRahprnDRm1gt4403csHr8e1DekLLWkTzcYVR+vfG0BAtpLezKcJPQtGS+1NRS Ww+OhjLvJmZYjuiDhgeeYh4B1c6ZPCZSTwVoX/1c6j35x2mR1PpAAXzdgGakrUiNOxzf D7uANdCf+z/KPYw5XjbzH/5TI8XTZU/nBe3AS4+IhPW16cRTXRLgi2syMYhSCGhqhWR/ d+rX2r9UNAGFNXXV8P8VCacwFB/jipSJSshsAiBiCh8wuzDBi/Jx2EwRjVJChcY5qH/a lZFA== X-Gm-Message-State: ALoCoQlE/ULK9G6xsSiqyHB9xb0hEwOaG8HDzc0/OWqb8PxEUGVvpmtQlYGALEo44USMN7gTwwts X-Received: by 10.236.124.161 with SMTP id x21mr1334184yhh.48.1406811237649; Thu, 31 Jul 2014 05:53:57 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.136 with SMTP id a8ls938859qgf.2.gmail; Thu, 31 Jul 2014 05:53:57 -0700 (PDT) X-Received: by 10.220.195.67 with SMTP id eb3mr12507664vcb.30.1406811237554; Thu, 31 Jul 2014 05:53:57 -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 x5si4242957vcy.51.2014.07.31.05.53.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 05:53:57 -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 hq11so4062826vcb.38 for ; Thu, 31 Jul 2014 05:53:57 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr12586523vcb.0.1406811237447; Thu, 31 Jul 2014 05:53:57 -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 tc5csp15723vcb; Thu, 31 Jul 2014 05:53:56 -0700 (PDT) X-Received: by 10.194.22.194 with SMTP id g2mr16670249wjf.30.1406811236369; Thu, 31 Jul 2014 05:53:56 -0700 (PDT) Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id n17si33165128wij.84.2014.07.31.05.53.50 for ; Thu, 31 Jul 2014 05:53:51 -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 3672226573D; Thu, 31 Jul 2014 14:53:50 +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 E8D30265613; Thu, 31 Jul 2014 14:43:36 +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 DA34C2654E2; Thu, 31 Jul 2014 14:43:32 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id F0D2526569B for ; Thu, 31 Jul 2014 14:25:20 +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 1XCpQ3-0004Ua-Au; Thu, 31 Jul 2014 12:25:19 +0000 Received: from broonie by debutante with local (Exim 4.83) (envelope-from ) id 1XCpQ0-0005cL-Ex; Thu, 31 Jul 2014 13:25:12 +0100 From: Mark Brown To: Liam Girdwood Date: Thu, 31 Jul 2014 13:25:06 +0100 Message-Id: <1406809509-21544-2-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1406809509-21544-1-git-send-email-broonie@kernel.org> References: <1406809509-21544-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] ASoC: sgtl5000: 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/sgtl5000.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index d739f83380a8..e997d271728d 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -724,25 +724,25 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream, return ret; /* set i2s data format */ - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S16_LE: + switch (params_width(params)) { + case 16: if (sgtl5000->fmt == SND_SOC_DAIFMT_RIGHT_J) return -EINVAL; i2s_ctl |= SGTL5000_I2S_DLEN_16 << SGTL5000_I2S_DLEN_SHIFT; i2s_ctl |= SGTL5000_I2S_SCLKFREQ_32FS << SGTL5000_I2S_SCLKFREQ_SHIFT; break; - case SNDRV_PCM_FORMAT_S20_3LE: + case 20: i2s_ctl |= SGTL5000_I2S_DLEN_20 << SGTL5000_I2S_DLEN_SHIFT; i2s_ctl |= SGTL5000_I2S_SCLKFREQ_64FS << SGTL5000_I2S_SCLKFREQ_SHIFT; break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: i2s_ctl |= SGTL5000_I2S_DLEN_24 << SGTL5000_I2S_DLEN_SHIFT; i2s_ctl |= SGTL5000_I2S_SCLKFREQ_64FS << SGTL5000_I2S_SCLKFREQ_SHIFT; break; - case SNDRV_PCM_FORMAT_S32_LE: + case 32: if (sgtl5000->fmt == SND_SOC_DAIFMT_RIGHT_J) return -EINVAL; i2s_ctl |= SGTL5000_I2S_DLEN_32 << SGTL5000_I2S_DLEN_SHIFT;