| Message ID | 1454347747-10758-1-git-send-email-srinivas.kandagatla@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On 03/02/16 00:37, Kenneth Westfield wrote: > On Mon, Feb 01, 2016 at 09:29:07AM -0800, Srinivas Kandagatla wrote: >> 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 <srinivas.kandagatla@linaro.org> >> --- >> sound/soc/qcom/lpass-apq8016.c | 6 +++--- >> sound/soc/qcom/lpass.h | 2 +- >> 2 files changed, 4 insertions(+), 4 deletions(-) > > As stated in my comments on patch 3 (ASoC: qcom: rename > rdmactl_audif_start to dmactrl_audif_start), I believe this change could > be combined with that patch. Or at the very least, have this patch be > sequenced directly after patch 3. Ok, I will give it a go in next version. >
diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index 2d43842..df44f09 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];
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 <srinivas.kandagatla@linaro.org> --- sound/soc/qcom/lpass-apq8016.c | 6 +++--- sound/soc/qcom/lpass.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -- 1.9.1