On Fri, 16 Jun 2017 09:17:09 +0200, Christoph Hellwig wrote:
Use dma_alloc_attrs directly instead of the dma_alloc_noncoherent wrapper.
Signed-off-by: Christoph Hellwig hch@lst.de
Should I take this one through sound git tree, or would you prefer taking all through another?
In the latter case, Reviewed-by: Takashi Iwai tiwai@suse.de
thanks,
Takashi
sound/mips/hal2.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index 00fc9241d266..17a78a93e885 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c @@ -461,15 +461,15 @@ static int hal2_alloc_dmabuf(struct hal2_codec *codec) int count = H2_BUF_SIZE / H2_BLOCK_SIZE; int i;
- codec->buffer = dma_alloc_noncoherent(NULL, H2_BUF_SIZE,
&buffer_dma, GFP_KERNEL);
- codec->buffer = dma_alloc_attrs(NULL, H2_BUF_SIZE, &buffer_dma,
GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);
- desc = dma_alloc_noncoherent(NULL, count * sizeof(struct hal2_desc),
&desc_dma, GFP_KERNEL);
- desc = dma_alloc_attrs(NULL, count * sizeof(struct hal2_desc),
&desc_dma, GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);
dma_free_noncoherent(NULL, H2_BUF_SIZE,codec->buffer, buffer_dma);
dma_free_attrs(NULL, H2_BUF_SIZE, codec->buffer, buffer_dma,DMA_ATTR_NON_CONSISTENT);@@ -490,10 +490,10 @@ static int hal2_alloc_dmabuf(struct hal2_codec *codec)
static void hal2_free_dmabuf(struct hal2_codec *codec) {
- dma_free_noncoherent(NULL, codec->desc_count * sizeof(struct hal2_desc),
codec->desc, codec->desc_dma);- dma_free_noncoherent(NULL, H2_BUF_SIZE, codec->buffer,
codec->buffer_dma);
- dma_free_attrs(NULL, codec->desc_count * sizeof(struct hal2_desc),
codec->desc, codec->desc_dma, DMA_ATTR_NON_CONSISTENT);- dma_free_attrs(NULL, H2_BUF_SIZE, codec->buffer, codec->buffer_dma,
DMA_ATTR_NON_CONSISTENT);}
static struct snd_pcm_hardware hal2_pcm_hw = {
2.11.0
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel