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: 8269871 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 838949F1C0 for ; Wed, 10 Feb 2016 10:24:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A0EA42022A for ; Wed, 10 Feb 2016 10:24:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7A2A20145 for ; Wed, 10 Feb 2016 10:24:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757741AbcBJKTL (ORCPT ); Wed, 10 Feb 2016 05:19:11 -0500 Received: from mail-wm0-f48.google.com ([74.125.82.48]:34899 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757734AbcBJKTG (ORCPT ); Wed, 10 Feb 2016 05:19:06 -0500 Received: by mail-wm0-f48.google.com with SMTP id c200so21114867wme.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=UzDW8IfiI28Hvum5vdIup1C3uJIpL7sDmIen8tDN7GuJTLj8SYmeceUue5m8RHrA+R 7vBbtn9i8V8pJllElxXvB6o1wXjmVAT9u6Ypt6Pr2z1Xaga+WfQBYo3eDBVL+sJ5mr2z lQlapxj48SIfzCmcdIpScK8lrNkmrJZOr6JXeS52zcHbru7SUlulWF4i6OugtTDQMI/N HzZcuZ7I4Qn7eAYILHmoa5SvJyXYGX3/mA49d15kEiNoN8GpkJaqouVCoGKh/ogN27Xo BVMBZYasdHdElOJv6gNe3SqTGJA5zAUF8MLsWZcAoub5jD9g6iFB2ZKP+GCzb6c2Bqta D46w== X-Gm-Message-State: AG10YOSdUG1ZEcVtHn2uMMxQk/z9B6NrvnhLfiCv/LBhz2tQml5peus2BfJ0DO/Tl0c9NPQu 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-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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];