From patchwork Wed Feb 10 10:19:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 61626 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2552558lbl; Wed, 10 Feb 2016 02:19:19 -0800 (PST) X-Received: by 10.66.229.104 with SMTP id sp8mr57386311pac.53.1455099559137; Wed, 10 Feb 2016 02:19:19 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id eg4si4232454pac.40.2016.02.10.02.19.18; Wed, 10 Feb 2016 02:19:19 -0800 (PST) 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; 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; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757766AbcBJKTO (ORCPT + 30 others); Wed, 10 Feb 2016 05:19:14 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:37259 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757733AbcBJKTG (ORCPT ); Wed, 10 Feb 2016 05:19:06 -0500 Received: by mail-wm0-f47.google.com with SMTP id g62so19883387wme.0 for ; Wed, 10 Feb 2016 02:19:05 -0800 (PST) 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=QQA0SqZZhnm2uZAWXfXDH9KCOf3ES9qXaA/7Bry+iqo=; b=b6rmb8GTr9EhI3R8kyj1BCgZIYC9pf4+mGMo7mRjgfus3QjTlTGdg52nj/cCTqXGnU Ozu6IW8AKrThUukgAqXc4t+OzWY7gTB0VkmoOMhA1NsMpR2K1Izrvks8A7jiz958BTjY CUMoFmICFQ6TxWL2QqhywFFbMJuLwTPfT6fpk= 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=QQA0SqZZhnm2uZAWXfXDH9KCOf3ES9qXaA/7Bry+iqo=; b=aXABq8F01LvqNAWYDUmm7O8QfZASOgQBB89+mvlQi3+RV1KeutcTV+7YEvsZBIa+UW phw3GSiKkHXXD7w0Her4BGPMilMAgs9dLnaZU1wnYKGs2prN9lYOluhwYfP9CARvXX0z WR3C4c9YdO0INh+j8AEBULRRnaqZLlp+F6anOixnsCCCqEo4I/n24SWrOFt/QSNECgMQ cMUSn0pTinRRphdc1poMM+KLVyvtcYcEQVcVIaKNqCbLBOz9UoRxIU54U3cs2NYeFJtm 5y+SBlesKZzRZ+LbMNHt447eZiWKft80PW0IW3CB1up8HpEpI17CG5UvEeM7aJqUlEDD jpiA== X-Gm-Message-State: AG10YOTkEguwbCV2B/zPc826vhwAHhNrJuPpqh/vWlIMM7y/QNJ9zpGsoz6uhH5xbnY/J342 X-Received: by 10.194.78.175 with SMTP id c15mr39369233wjx.16.1455099545248; Wed, 10 Feb 2016 02:19:05 -0800 (PST) Received: from localhost.localdomain (host-92-13-246-184.as43234.net. [92.13.246.184]) by smtp.gmail.com with ESMTPSA id t12sm3482895wmt.20.2016.02.10.02.19.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Feb 2016 02:19:04 -0800 (PST) From: Srinivas Kandagatla To: Patrick Lai , alsa-devel@alsa-project.org, Mark Brown Cc: Banajit Goswami , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, kwestfie@codeaurora.org, Srinivas Kandagatla Subject: [PATCH v1 06/14] ASoC: qcom: rename rdma_ch_bit_map to dma_ch_bit_map Date: Wed, 10 Feb 2016 10:19:02 +0000 Message-Id: <1455099542-577-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455099418-311-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1455099418-311-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 rdma_ch_bit_map can be reused for wrdma channel allocations as wrdma channel numbering start after rdma channel numbers. With capture support referring rdma_ch_bit_map for wrdma channel allocation is confusing, so renaming rdma_ch_bit_map to dma_ch_bit_map makes sense. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/lpass-apq8016.c | 6 +++--- sound/soc/qcom/lpass.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -- 1.9.1 diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index 99061f4..ca3bbd5 100644 --- a/sound/soc/qcom/lpass-apq8016.c +++ b/sound/soc/qcom/lpass-apq8016.c @@ -137,20 +137,20 @@ static int apq8016_lpass_alloc_dma_channel(struct lpass_data *drvdata, int direction) { struct lpass_variant *v = drvdata->variant; - int chan = find_first_zero_bit(&drvdata->rdma_ch_bit_map, + int chan = find_first_zero_bit(&drvdata->dma_ch_bit_map, v->rdma_channels); if (chan >= v->rdma_channels) return -EBUSY; - set_bit(chan, &drvdata->rdma_ch_bit_map); + set_bit(chan, &drvdata->dma_ch_bit_map); return chan; } static int apq8016_lpass_free_dma_channel(struct lpass_data *drvdata, int chan) { - clear_bit(chan, &drvdata->rdma_ch_bit_map); + clear_bit(chan, &drvdata->dma_ch_bit_map); return 0; } diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h index 8475b60..30714ad 100644 --- a/sound/soc/qcom/lpass.h +++ b/sound/soc/qcom/lpass.h @@ -50,7 +50,7 @@ struct lpass_data { struct lpass_variant *variant; /* bit map to keep track of static channel allocations */ - unsigned long rdma_ch_bit_map; + unsigned long dma_ch_bit_map; /* used it for handling interrupt per dma channel */ struct snd_pcm_substream *substream[LPASS_MAX_DMA_CHANNELS];