diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2020-01-13 16:27:47 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-01-29 21:13:25 -0700 |
| commit | 7991901082f0626592885a77a2cf8162536d1a51 (patch) | |
| tree | c77f27bb446e9206611baa250b36e3801d6bece0 /drivers/ata | |
| parent | 10a663a1b15134a5a714aa515e11425a44d4fdf7 (diff) | |
| download | linux-7991901082f0626592885a77a2cf8162536d1a51.tar.gz linux-7991901082f0626592885a77a2cf8162536d1a51.tar.bz2 linux-7991901082f0626592885a77a2cf8162536d1a51.zip | |
ata: pata_arasan_cf: Use dma_request_chan() instead dma_request_slave_channel()
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.
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_arasan_cf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c index 391dff0f25a2..e9cf31f38450 100644 --- a/drivers/ata/pata_arasan_cf.c +++ b/drivers/ata/pata_arasan_cf.c @@ -526,9 +526,10 @@ static void data_xfer(struct work_struct *work) /* request dma channels */ /* dma_request_channel may sleep, so calling from process context */ - acdev->dma_chan = dma_request_slave_channel(acdev->host->dev, "data"); - if (!acdev->dma_chan) { + acdev->dma_chan = dma_request_chan(acdev->host->dev, "data"); + if (IS_ERR(acdev->dma_chan)) { dev_err(acdev->host->dev, "Unable to get dma_chan\n"); + acdev->dma_chan = NULL; goto chan_request_fail; } @@ -539,6 +540,7 @@ static void data_xfer(struct work_struct *work) } dma_release_channel(acdev->dma_chan); + acdev->dma_chan = NULL; /* data xferred successfully */ if (!ret) { |