2023-11-18 08:42:30

by Christophe JAILLET

Subject: [PATCH v2] ata: pata_pxa: convert not to use dma_request_slave_channel()

dma_request_slave_channel() is deprecated. dma_request_chan() should
be used directly instead.

Switch to the preferred function and update the error handling accordingly.
While at it, also propagate the error code that is now available.

Signed-off-by: Christophe JAILLET <[email protected]>
---
v2: Propagate the error code [Sergey Shtylyov]

v1: https://lore.kernel.org/all/f177835b7f0db810a132916c8a281bbdaf47f9d3.1699801657.git.christophe.jaillet@wanadoo.fr/
---
drivers/ata/pata_pxa.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c
index 5275c6464f57..538bd3423d85 100644
--- a/drivers/ata/pata_pxa.c
+++ b/drivers/ata/pata_pxa.c
@@ -274,10 +274,9 @@ static int pxa_ata_probe(struct platform_device *pdev)
/*
* Request the DMA channel
*/
- data->dma_chan =
- dma_request_slave_channel(&pdev->dev, "data");
- if (!data->dma_chan)
- return -EBUSY;
+ data->dma_chan = dma_request_chan(&pdev->dev, "data");
+ if (IS_ERR(data->dma_chan))
+ return PTR_ERR(data->dma_chan);
ret = dmaengine_slave_config(data->dma_chan, &config);
if (ret < 0) {
dev_err(&pdev->dev, "dma configuration failed: %d\n", ret);
--
2.34.1

2023-11-18 19:29:47

by Sergey Shtylyov

Subject: Re: [PATCH v2] ata: pata_pxa: convert not to use dma_request_slave_channel()

On 11/18/23 11:42 AM, Christophe JAILLET wrote:

> dma_request_slave_channel() is deprecated. dma_request_chan() should
> be used directly instead.
>
> Switch to the preferred function and update the error handling accordingly.
> While at it, also propagate the error code that is now available.
>
> Signed-off-by: Christophe JAILLET <[email protected]>

Reviewed-by: Sergey Shtylyov <[email protected]>

[...]

MBR, Sergey

2023-11-20 00:31:34

by Damien Le Moal

Subject: Re: [PATCH v2] ata: pata_pxa: convert not to use dma_request_slave_channel()

On 11/18/23 17:42, Christophe JAILLET wrote:
> dma_request_slave_channel() is deprecated. dma_request_chan() should
> be used directly instead.
>
> Switch to the preferred function and update the error handling accordingly.
> While at it, also propagate the error code that is now available.
>
> Signed-off-by: Christophe JAILLET <[email protected]>

Applied to for-6.8. Thanks !

--
Damien Le Moal
Western Digital Research