From patchwork Thu Feb 11 12:17:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 8278721 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 11653BEEE5 for ; Thu, 11 Feb 2016 12:21:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B5E62035D for ; Thu, 11 Feb 2016 12:21:56 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 0AE3E20251 for ; Thu, 11 Feb 2016 12:21:55 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 142BB2658E8; Thu, 11 Feb 2016 13:21:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, NO_DNS_FOR_FROM,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id B3F4326593A; Thu, 11 Feb 2016 13:19:20 +0100 (CET) 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 8DE51265A1D; Thu, 11 Feb 2016 13:19:19 +0100 (CET) Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by alsa0.perex.cz (Postfix) with ESMTP id AF1F526593A for ; Thu, 11 Feb 2016 13:17:53 +0100 (CET) Received: by mail-wm0-f48.google.com with SMTP id p63so70269582wmp.1 for ; Thu, 11 Feb 2016 04:17:53 -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=R+Gw43X8Pxlr+V0ojBabJxJiF0Y7qDVEJWwH0Pyf8z4=; b=BOrXqeQVBd8zj1nbh5+SEDAZcDSyLA9KmNPIt3ZqfNyy85drqteASoBuYofI0Ma4Bj PNniY00wtoJ5gGuyj7f/fNTM/9tZWwr2+Y+/jdHVikaGBRfGWd3ukhKn2LoPPUKqW6Iy qcWFWPiKB5pcHuGpjlV8uTWEwChLy1pKBqWQI= 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=R+Gw43X8Pxlr+V0ojBabJxJiF0Y7qDVEJWwH0Pyf8z4=; b=P67YxUfnzjf0brPzJyPEa6s2CtLGiqMujutz+7OcaRFCXp0bCZ9Ew8cIPHtlgQrci/ wdtXT4IO/LcrodteIpPpSwFsmNSx5kvgSafk0DJ7HCLcN1TOKaBpjuFa+/2W+Xq+MRFz L9PUM5DukY5Ny/CehQrrNehrVd+wqQUbY3HjvBZkRX/AnZeBT/lCT5FsJV/j/3d0W+PP FjS3y3m3HgX7+uQU6B8uPWp0gh9RiYQi/t1uyKugaZY2MvOLdMr9OPX7+KHT17ofC25I 2PN3GdpltN47OvWyb5hR0Fz4L2nkryTpwHSwiRnxcB4FxAKoyjRqABP8uJ32gVja7ZI/ 4w6g== X-Gm-Message-State: AG10YOSZAMu+Hycbl974DRM+e3oE7cqTF586R6DZg4HcOCS8K2dwY/r58cPpgrAYIx7v19Ib X-Received: by 10.28.127.5 with SMTP id a5mr18151272wmd.32.1455193073476; Thu, 11 Feb 2016 04:17:53 -0800 (PST) Received: from localhost.localdomain (host-92-13-246-184.as43234.net. [92.13.246.184]) by smtp.gmail.com with ESMTPSA id lm5sm7300738wjc.12.2016.02.11.04.17.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Feb 2016 04:17:52 -0800 (PST) From: Srinivas Kandagatla To: Patrick Lai , alsa-devel@alsa-project.org, Mark Brown Date: Thu, 11 Feb 2016 12:17:51 +0000 Message-Id: <1455193071-1746-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455193007-1481-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1455193007-1481-1-git-send-email-srinivas.kandagatla@linaro.org> Cc: kwestfie@codeaurora.org, Banajit Goswami , Liam Girdwood , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Takashi Iwai , Srinivas Kandagatla Subject: [alsa-devel] [PATCH v3 06/14] ASoC: qcom: rename rdma_ch_bit_map to dma_ch_bit_map X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" 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-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 Acked-by: Kenneth Westfield --- 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];