| Message ID | 20191217074019.21732-1-peter.ujfalusi@ti.com |
|---|---|
| State | Accepted |
| Commit | fb185a4052b18c97ebc98f6a8db30a60abca35e0 |
| Headers | show |
| Series | powerpc/512x: Use dma_request_chan() instead dma_request_slave_channel() | expand |
Hi, On 17/12/2019 9.40, Peter Ujfalusi wrote: > dma_request_slave_channel() is a wrapper on top of dma_request_chan() > eating up the error code. > > By using dma_request_chan() directly the driver can support deferred > probing against DMA. I sent this patch to wrong participants... Forgot to change directory. The correct (ata: pxa:) should be on it way. > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > --- > arch/powerpc/platforms/512x/mpc512x_lpbfifo.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c b/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c > index 13631f35cd14..04bf6ecf7d55 100644 > --- a/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c > +++ b/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c > @@ -434,9 +434,9 @@ static int mpc512x_lpbfifo_probe(struct platform_device *pdev) > memset(&lpbfifo, 0, sizeof(struct lpbfifo_data)); > spin_lock_init(&lpbfifo.lock); > > - lpbfifo.chan = dma_request_slave_channel(&pdev->dev, "rx-tx"); > - if (lpbfifo.chan == NULL) > - return -EPROBE_DEFER; > + lpbfifo.chan = dma_request_chan(&pdev->dev, "rx-tx"); > + if (IS_ERR(lpbfifo.chan)) > + return PTR_ERR(lpbfifo.chan); > > if (of_address_to_resource(pdev->dev.of_node, 0, &r) != 0) { > dev_err(&pdev->dev, "bad 'reg' in 'sclpc' device tree node\n"); > - Péter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
diff --git a/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c b/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c index 13631f35cd14..04bf6ecf7d55 100644 --- a/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c +++ b/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c @@ -434,9 +434,9 @@ static int mpc512x_lpbfifo_probe(struct platform_device *pdev) memset(&lpbfifo, 0, sizeof(struct lpbfifo_data)); spin_lock_init(&lpbfifo.lock); - lpbfifo.chan = dma_request_slave_channel(&pdev->dev, "rx-tx"); - if (lpbfifo.chan == NULL) - return -EPROBE_DEFER; + lpbfifo.chan = dma_request_chan(&pdev->dev, "rx-tx"); + if (IS_ERR(lpbfifo.chan)) + return PTR_ERR(lpbfifo.chan); if (of_address_to_resource(pdev->dev.of_node, 0, &r) != 0) { dev_err(&pdev->dev, "bad 'reg' in 'sclpc' device tree node\n");
dma_request_slave_channel() is a wrapper on top of dma_request_chan() eating up the error code. By using dma_request_chan() directly the driver can support deferred probing against DMA. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- arch/powerpc/platforms/512x/mpc512x_lpbfifo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki