From 6eb375e54d95c5a9fc4ef041de0d4fa14a45babb Mon Sep 17 00:00:00 2001 From: Leonard Crestez Date: Fri, 4 Oct 2019 01:22:12 +0300 Subject: ASoC: imx-pcm-rpmsg: Fix writecombine/wc build error Signed-off-by: Leonard Crestez --- sound/soc/fsl/imx-pcm-rpmsg.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sound/soc/fsl/imx-pcm-rpmsg.c') diff --git a/sound/soc/fsl/imx-pcm-rpmsg.c b/sound/soc/fsl/imx-pcm-rpmsg.c index f49205a6c41a..005c5442e9e9 100644 --- a/sound/soc/fsl/imx-pcm-rpmsg.c +++ b/sound/soc/fsl/imx-pcm-rpmsg.c @@ -281,10 +281,10 @@ static int imx_rpmsg_pcm_mmap(struct snd_pcm_substream *substream, { struct snd_pcm_runtime *runtime = substream->runtime; - return dma_mmap_writecombine(substream->pcm->card->dev, vma, - runtime->dma_area, - runtime->dma_addr, - runtime->dma_bytes); + return dma_mmap_wc(substream->pcm->card->dev, vma, + runtime->dma_area, + runtime->dma_addr, + runtime->dma_bytes); } static void imx_rpmsg_pcm_dma_complete(void *arg) @@ -646,8 +646,8 @@ static int imx_rpmsg_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, buf->dev.type = SNDRV_DMA_TYPE_DEV; buf->dev.dev = pcm->card->dev; buf->private_data = NULL; - buf->area = dma_alloc_writecombine(pcm->card->dev, size, - &buf->addr, GFP_KERNEL); + buf->area = dma_alloc_wc(pcm->card->dev, size, + &buf->addr, GFP_KERNEL); if (!buf->area) return -ENOMEM; @@ -671,8 +671,8 @@ static void imx_rpmsg_pcm_free_dma_buffers(struct snd_pcm *pcm) if (!buf->area) continue; - dma_free_writecombine(pcm->card->dev, buf->bytes, - buf->area, buf->addr); + dma_free_wc(pcm->card->dev, buf->bytes, + buf->area, buf->addr); buf->area = NULL; } } -- cgit v1.2.3