[PATCH v3] iio: adc: at91-sama5d2_adc: Use dma_request_chan() instead dma_request_slave_channel()

[PATCH v3] iio: adc: at91-sama5d2_adc: Use dma_request_chan() instead dma_request_slave_channel()

[Peter Ujfalusi]

dma_request_slave_channel() is a wrapper on top of dma_request_chan()
eating up the error code.

The dma_request_chan() is the standard API to request slave channel,
clients should be moved away from the legacy API to allow us to retire
them.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
Hi,

Changes since v2:
- Commit message updated

Changes since v1:
- Subject prefix is corrected to "iio: adc: at91-sama5d2_adc:"

Regards,
Peter

 drivers/iio/adc/at91-sama5d2_adc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
index e1850f3d5cf3..a5c7771227d5 100644
--- a/drivers/iio/adc/at91-sama5d2_adc.c
+++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -1444,10 +1444,10 @@ static void at91_adc_dma_init(struct platform_device *pdev)
 	if (st->dma_st.dma_chan)
 		return;
 
-	st->dma_st.dma_chan = dma_request_slave_channel(&pdev->dev, "rx");
-
-	if (!st->dma_st.dma_chan)  {
+	st->dma_st.dma_chan = dma_request_chan(&pdev->dev, "rx");
+	if (IS_ERR(st->dma_st.dma_chan))  {
 		dev_info(&pdev->dev, "can't get DMA channel\n");
+		st->dma_st.dma_chan = NULL;
 		goto dma_exit;
 	}
 
-- 
Peter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

Re: [PATCH v3] iio: adc: at91-sama5d2_adc: Use dma_request_chan() instead dma_request_slave_channel()

[Jonathan Cameron]

On Tue, 7 Jan 2020 13:37:29 +0200
Peter Ujfalusi <peter.ujfalusi@ti.com> wrote:

> dma_request_slave_channel() is a wrapper on top of dma_request_chan()
> eating up the error code.
> 
> The dma_request_chan() is the standard API to request slave channel,
> clients should be moved away from the legacy API to allow us to retire
> them.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Applied to the togreg branch of iio.git and pushed out as testing.
Note that tree will get rebased shortly to catch up with upstream.
(testing can in theory be rebased at any time even if I don't do it
that often).

Thanks,

Jonathan

> ---
> Hi,
> 
> Changes since v2:
> - Commit message updated
> 
> Changes since v1:
> - Subject prefix is corrected to "iio: adc: at91-sama5d2_adc:"
> 
> Regards,
> Peter
> 
>  drivers/iio/adc/at91-sama5d2_adc.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
> index e1850f3d5cf3..a5c7771227d5 100644
> --- a/drivers/iio/adc/at91-sama5d2_adc.c
> +++ b/drivers/iio/adc/at91-sama5d2_adc.c
> @@ -1444,10 +1444,10 @@ static void at91_adc_dma_init(struct platform_device *pdev)
>  	if (st->dma_st.dma_chan)
>  		return;
>  
> -	st->dma_st.dma_chan = dma_request_slave_channel(&pdev->dev, "rx");
> -
> -	if (!st->dma_st.dma_chan)  {
> +	st->dma_st.dma_chan = dma_request_chan(&pdev->dev, "rx");
> +	if (IS_ERR(st->dma_st.dma_chan))  {
>  		dev_info(&pdev->dev, "can't get DMA channel\n");
> +		st->dma_st.dma_chan = NULL;
>  		goto dma_exit;
>  	}
>