diff options
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/fsl_asrc.c | 10 | ||||
| -rw-r--r-- | sound/soc/fsl/imx-hdmi-dma.c | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index 13097a5566b2..dc230ffee9dd 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -133,14 +133,8 @@ static int asrc_p2p_request_channel(struct snd_pcm_substream *substream) dev_err(rtd->card->dev, "can not config dma channel\n"); goto error; } - asrc_p2p->asrc_p2p_desc = chan->device->device_prep_dma_cyclic( - chan, - 0xffff, - 64, - 64, - DMA_DEV_TO_DEV, - 0, - NULL); + asrc_p2p->asrc_p2p_desc = dmaengine_prep_dma_cyclic(chan, 0xffff, 64, + 64, DMA_DEV_TO_DEV, 0); if (!asrc_p2p->asrc_p2p_desc) { dev_err(&chan->dev->device, "cannot prepare slave dma\n"); diff --git a/sound/soc/fsl/imx-hdmi-dma.c b/sound/soc/fsl/imx-hdmi-dma.c index b76bd79c8cfa..8f99d165ae94 100644 --- a/sound/soc/fsl/imx-hdmi-dma.c +++ b/sound/soc/fsl/imx-hdmi-dma.c @@ -674,7 +674,6 @@ static int hdmi_sdma_config(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct device *dai_dev = ¶ms->pdev->dev; struct device *dev = rtd->platform->dev; - struct dma_device *dmac_dev; struct dma_slave_config slave_config; int ret; @@ -698,9 +697,8 @@ static int hdmi_sdma_config(struct snd_pcm_substream *substream, return -EINVAL; } - dmac_dev = params->dma_channel->device; - params->desc = dmac_dev->device_prep_dma_cyclic(params->dma_channel, - 0, 0, 0, DMA_TRANS_NONE, 0, NULL); + params->desc = dmaengine_prep_dma_cyclic(params->dma_channel, 0, 0, 0, + DMA_TRANS_NONE, 0); if (!params->desc) { dev_err(dev, "failed to prepare slave dma\n"); return -EINVAL; |