diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-02-11 12:17:51 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-20 01:20:18 +0900 |
| commit | 4d809fb12189aef9419f7337bb1767de85699003 (patch) | |
| tree | 3429c453c924147ac99c01d0657dc743d3d00971 /sound/soc/qcom | |
| parent | 0a536400ad2ea72c80e6257fa71aa78d17bd43e3 (diff) | |
| download | linux-4d809fb12189aef9419f7337bb1767de85699003.tar.gz linux-4d809fb12189aef9419f7337bb1767de85699003.tar.bz2 linux-4d809fb12189aef9419f7337bb1767de85699003.zip | |
ASoC: qcom: rename rdma_ch_bit_map to dma_ch_bit_map
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>
Acked-by: Kenneth Westfield <kwestfie@codeaurora.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/qcom')
| -rw-r--r-- | sound/soc/qcom/lpass-apq8016.c | 6 | ||||
| -rw-r--r-- | 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 99061f42953e..ca3bbd58c81a 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 8475b609f8ce..30714ad1e138 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]; |