hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: hal2: switch to dma_alloc_attrs 

Use dma_alloc_attrs directly instead of the dma_alloc_noncoherent wrapper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Christoph Hellwig 2017-06-16 09:17:09 +02:00 committed by Takashi Iwai
parent ba61faf0d7
commit 15b5ef4290
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sound/mips/hal2.c
View File

@ -461,15 +461,15 @@ static int hal2_alloc_dmabuf(struct hal2_codec *codec)
int count = H2_BUF_SIZE / H2_BLOCK_SIZE; int count = H2_BUF_SIZE / H2_BLOCK_SIZE;
int i; int i;
codec->buffer = dma_alloc_noncoherent(NULL, H2_BUF_SIZE, codec->buffer = dma_alloc_attrs(NULL, H2_BUF_SIZE, &buffer_dma,
&buffer_dma, GFP_KERNEL); GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);
if (!codec->buffer) if (!codec->buffer)
return -ENOMEM; return -ENOMEM;
desc = dma_alloc_noncoherent(NULL, count * sizeof(struct hal2_desc), desc = dma_alloc_attrs(NULL, count * sizeof(struct hal2_desc),
&desc_dma, GFP_KERNEL); &desc_dma, GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);
if (!desc) { if (!desc) {
dma_free_noncoherent(NULL, H2_BUF_SIZE, dma_free_attrs(NULL, H2_BUF_SIZE, codec->buffer, buffer_dma,
codec->buffer, buffer_dma); DMA_ATTR_NON_CONSISTENT);
return -ENOMEM; return -ENOMEM;
} }
codec->buffer_dma = buffer_dma; codec->buffer_dma = buffer_dma;
@ -490,10 +490,10 @@ static int hal2_alloc_dmabuf(struct hal2_codec *codec)
static void hal2_free_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), dma_free_attrs(NULL, codec->desc_count * sizeof(struct hal2_desc),
codec->desc, codec->desc_dma); codec->desc, codec->desc_dma, DMA_ATTR_NON_CONSISTENT);
dma_free_noncoherent(NULL, H2_BUF_SIZE, codec->buffer, dma_free_attrs(NULL, H2_BUF_SIZE, codec->buffer, codec->buffer_dma,
codec->buffer_dma); DMA_ATTR_NON_CONSISTENT);
} }
static struct snd_pcm_hardware hal2_pcm_hw = { static struct snd_pcm_hardware hal2_pcm_hw = {