From: Peter Ujfalusi Date: Tue, 17 Dec 2019 07:33:05 +0000 (+0200) Subject: crypto: img-hash - Use dma_request_chan instead dma_request_slave_channel X-Git-Tag: v5.10.7~3034^2~124 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8004865c2e7bc9574d5ddfc99fe2a90eca840b17;p=platform%2Fkernel%2Flinux-rpi.git crypto: img-hash - 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. By using dma_request_chan() directly the driver can support deferred probing against DMA. Signed-off-by: Peter Ujfalusi Signed-off-by: Herbert Xu --- diff --git a/drivers/crypto/img-hash.c b/drivers/crypto/img-hash.c index fe4cc8b..25d5227 100644 --- a/drivers/crypto/img-hash.c +++ b/drivers/crypto/img-hash.c @@ -332,10 +332,10 @@ static int img_hash_dma_init(struct img_hash_dev *hdev) struct dma_slave_config dma_conf; int err = -EINVAL; - hdev->dma_lch = dma_request_slave_channel(hdev->dev, "tx"); - if (!hdev->dma_lch) { + hdev->dma_lch = dma_request_chan(hdev->dev, "tx"); + if (IS_ERR(hdev->dma_lch)) { dev_err(hdev->dev, "Couldn't acquire a slave DMA channel.\n"); - return -EBUSY; + return PTR_ERR(hdev->dma_lch); } dma_conf.direction = DMA_MEM_TO_DEV; dma_conf.dst_addr = hdev->bus_addr;