From patchwork Fri Oct 28 15:32:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 79957 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1238063qge; Fri, 28 Oct 2016 08:32:47 -0700 (PDT) X-Received: by 10.98.48.69 with SMTP id w66mr26376106pfw.0.1477668767888; Fri, 28 Oct 2016 08:32:47 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qg4si1744672pac.339.2016.10.28.08.32.47; Fri, 28 Oct 2016 08:32:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965621AbcJ1Pca (ORCPT + 27 others); Fri, 28 Oct 2016 11:32:30 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:35856 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S942216AbcJ1Pc1 (ORCPT ); Fri, 28 Oct 2016 11:32:27 -0400 Received: by mail-wm0-f42.google.com with SMTP id p190so18657679wmp.1 for ; Fri, 28 Oct 2016 08:32:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A9+gxdtkSOri0YiOYRtsYm2ogppw/sHvozKOvm/XCUE=; b=ekL3kOIQoA2igawka0CzpyTO49JHlt3LGTo9DMzAf788fbFg1Sn1S2qNvxdVUf12Qe eQQIGOHMf5jRHOagYqHdyYiyW7M64CRYTCPLZLUrv0qj8fCNoMsyh+ErCZ1zjLcy7uNe WrrC+uNez/p2dzFf3OV2vECn7bqPIiq8JLbaM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=A9+gxdtkSOri0YiOYRtsYm2ogppw/sHvozKOvm/XCUE=; b=f39s0/krF0CNl5JvlWoJGQy88wwrunBy/rc1t4VYGS/iS3jZZ+LW/QPiHI7jwUTaB3 rANidBLVHYyGJoiTWdCoDtHyWG8nzLaomYfWiQ1jBK2ZP1HcFvmFifljIPwrMyq8qolk 7ewPJodg5uZWFnQogE6Wnkt+7z/KC2aS8/WxF/0BTc+Urt8yao3PmbCD7p+Cb6QtsWta zVoKqALVTeL5t6mstcJR07kEJHn38YAKEuhF4y0i/Arv2CUUsNU7cEd4ldujzUO9NU3E xitfl9Z2h/XU3EvzlD0kjLzE71XyPJW+OBniJ3O5IL978W6NFO8b+KhI62jkc1iDt7qQ uIUw== X-Gm-Message-State: ABUngvdEoZxlisQ9lSZF5gG8rIN3wFXed2m0kqSEsKp6T8lM0yAzvuc2Jkb6OM6o17O8hHdE X-Received: by 10.28.12.77 with SMTP id 74mr4526831wmm.115.1477668745369; Fri, 28 Oct 2016 08:32:25 -0700 (PDT) Received: from localhost.localdomain (host-2-98-102-117.as13285.net. [2.98.102.117]) by smtp.gmail.com with ESMTPSA id za1sm14708033wjb.8.2016.10.28.08.32.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Oct 2016 08:32:24 -0700 (PDT) From: Srinivas Kandagatla To: Mark Brown , alsa-devel@alsa-project.org Cc: Banajit Goswami , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , linux-kernel@vger.kernel.org, Kenneth Westfield , Kuninori Morimoto , Srinivas Kandagatla Subject: [PATCH 1/3] ASoC: lpass-platform: use dma_ch instead of rdma_ch/wrdma_ch Date: Fri, 28 Oct 2016 16:32:18 +0100 Message-Id: <1477668740-30389-2-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477668740-30389-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1477668740-30389-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch cleans up usage of wrdma_ch and rdma_ch variables into a common variable dma_ch, As there is no real use of tracking the dma channel in two different variables based on stream direction. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/lpass-platform.c | 53 +++++++++++++---------------------------- 1 file changed, 17 insertions(+), 36 deletions(-) -- 2.10.1 Acked-by: Kenneth Westfield diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c index e2ff538..2570c96 100644 --- a/sound/soc/qcom/lpass-platform.c +++ b/sound/soc/qcom/lpass-platform.c @@ -25,8 +25,7 @@ #include "lpass.h" struct lpass_pcm_data { - int rdma_ch; - int wrdma_ch; + int dma_ch; int i2s_port; }; @@ -95,10 +94,7 @@ static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream, int bitwidth; int ret, dma_port = pcm_data->i2s_port + v->dmactl_audif_start; - if (dir == SNDRV_PCM_STREAM_PLAYBACK) - ch = pcm_data->rdma_ch; - else - ch = pcm_data->wrdma_ch; + ch = pcm_data->dma_ch; bitwidth = snd_pcm_format_width(format); if (bitwidth < 0) { @@ -184,11 +180,7 @@ static int lpass_platform_pcmops_hw_free(struct snd_pcm_substream *substream) unsigned int reg; int ret; - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - reg = LPAIF_RDMACTL_REG(v, pcm_data->rdma_ch); - else - reg = LPAIF_WRDMACTL_REG(v, pcm_data->wrdma_ch); - + reg = LPAIF_DMACTL_REG(v, pcm_data->dma_ch, substream->stream); ret = regmap_write(drvdata->lpaif_map, reg, 0); if (ret) dev_err(soc_runtime->dev, "%s() error writing to rdmactl reg: %d\n", @@ -207,10 +199,7 @@ static int lpass_platform_pcmops_prepare(struct snd_pcm_substream *substream) struct lpass_variant *v = drvdata->variant; int ret, ch, dir = substream->stream; - if (dir == SNDRV_PCM_STREAM_PLAYBACK) - ch = pcm_data->rdma_ch; - else - ch = pcm_data->wrdma_ch; + ch = pcm_data->dma_ch; ret = regmap_write(drvdata->lpaif_map, LPAIF_DMABASE_REG(v, ch, dir), @@ -261,10 +250,7 @@ static int lpass_platform_pcmops_trigger(struct snd_pcm_substream *substream, struct lpass_variant *v = drvdata->variant; int ret, ch, dir = substream->stream; - if (dir == SNDRV_PCM_STREAM_PLAYBACK) - ch = pcm_data->rdma_ch; - else - ch = pcm_data->wrdma_ch; + ch = pcm_data->dma_ch; switch (cmd) { case SNDRV_PCM_TRIGGER_START: @@ -338,10 +324,7 @@ static snd_pcm_uframes_t lpass_platform_pcmops_pointer( unsigned int base_addr, curr_addr; int ret, ch, dir = substream->stream; - if (dir == SNDRV_PCM_STREAM_PLAYBACK) - ch = pcm_data->rdma_ch; - else - ch = pcm_data->wrdma_ch; + ch = pcm_data->dma_ch; ret = regmap_read(drvdata->lpaif_map, LPAIF_DMABASE_REG(v, ch, dir), &base_addr); @@ -488,13 +471,13 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) psubstream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; if (psubstream) { if (v->alloc_dma_channel) - data->rdma_ch = v->alloc_dma_channel(drvdata, + data->dma_ch = v->alloc_dma_channel(drvdata, SNDRV_PCM_STREAM_PLAYBACK); - if (data->rdma_ch < 0) - return data->rdma_ch; + if (data->dma_ch < 0) + return data->dma_ch; - drvdata->substream[data->rdma_ch] = psubstream; + drvdata->substream[data->dma_ch] = psubstream; ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, soc_runtime->platform->dev, @@ -503,7 +486,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) goto playback_alloc_err; ret = regmap_write(drvdata->lpaif_map, - LPAIF_RDMACTL_REG(v, data->rdma_ch), 0); + LPAIF_RDMACTL_REG(v, data->dma_ch), 0); if (ret) { dev_err(soc_runtime->dev, "%s() error writing to rdmactl reg: %d\n", @@ -515,15 +498,15 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) csubstream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream; if (csubstream) { if (v->alloc_dma_channel) - data->wrdma_ch = v->alloc_dma_channel(drvdata, + data->dma_ch = v->alloc_dma_channel(drvdata, SNDRV_PCM_STREAM_CAPTURE); - if (data->wrdma_ch < 0) { - ret = data->wrdma_ch; + if (data->dma_ch < 0) { + ret = data->dma_ch; goto capture_alloc_err; } - drvdata->substream[data->wrdma_ch] = csubstream; + drvdata->substream[data->dma_ch] = csubstream; ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, soc_runtime->platform->dev, @@ -532,7 +515,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) goto capture_alloc_err; ret = regmap_write(drvdata->lpaif_map, - LPAIF_WRDMACTL_REG(v, data->wrdma_ch), 0); + LPAIF_WRDMACTL_REG(v, data->dma_ch), 0); if (ret) { dev_err(soc_runtime->dev, "%s() error writing to wrdmactl reg: %d\n", @@ -573,9 +556,7 @@ static void lpass_platform_pcm_free(struct snd_pcm *pcm) drvdata = snd_soc_platform_get_drvdata(rt->platform); data = drvdata->private_data; - ch = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - ? data->rdma_ch - : data->wrdma_ch; + ch = data->dma_ch; v = drvdata->variant; drvdata->substream[ch] = NULL; if (v->free_dma_channel)