Replace dma_request_slave_channel() by dma_request_chan() as suggested since the former is deprecated.
Signed-off-by: Andy Shevchenko <[email protected]> --- sound/soc/sprd/sprd-pcm-compress.c | 7 +++---- sound/soc/sprd/sprd-pcm-dma.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/soc/sprd/sprd-pcm-compress.c b/sound/soc/sprd/sprd-pcm-compress.c index e5249924b54d..5613c25fffd7 100644 --- a/sound/soc/sprd/sprd-pcm-compress.c +++ b/sound/soc/sprd/sprd-pcm-compress.c @@ -153,11 +153,10 @@ static int sprd_platform_compr_dma_config(struct snd_soc_component *component, return -EINVAL; } - dma->chan = dma_request_slave_channel(dev, - dma_params->chan_name[channel]); - if (!dma->chan) { + dma->chan = dma_request_chan(dev, dma_params->chan_name[channel]); + if (IS_ERR(dma->chan)) { dev_err(dev, "failed to request dma channel\n"); - return -ENODEV; + return PTR_ERR(dma->chan); } sgt = sg = kzalloc_objs(*sg, sg_num); diff --git a/sound/soc/sprd/sprd-pcm-dma.c b/sound/soc/sprd/sprd-pcm-dma.c index f509a4601de2..1586eff61120 100644 --- a/sound/soc/sprd/sprd-pcm-dma.c +++ b/sound/soc/sprd/sprd-pcm-dma.c @@ -171,13 +171,12 @@ static int sprd_pcm_request_dma_channel(struct snd_soc_component *component, for (i = 0; i < channels; i++) { struct sprd_pcm_dma_data *data = &dma_private->data[i]; - data->chan = dma_request_slave_channel(dev, - dma_params->chan_name[i]); - if (!data->chan) { + data->chan = dma_request_chan(dev, dma_params->chan_name[i]); + if (IS_ERR(data->chan)) { dev_err(dev, "failed to request dma channel:%s\n", dma_params->chan_name[i]); sprd_pcm_release_dma_channel(substream); - return -ENODEV; + return PTR_ERR(data->chan); } } -- 2.50.1
