iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: sa2ul - Simplify with dev_err_probe()

Browse Source 
Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and also it prints the error value.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Krzysztof Kozlowski 2020-08-26 18:29:53 +02:00 committed by Herbert Xu
parent 4d6aef2f2e
commit 1b5d3a8b30
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/crypto/sa2ul.c
View File

@ -2243,25 +2243,21 @@ static int sa_dma_init(struct sa_crypto_data *dd)
return ret;
dd->dma_rx1 = dma_request_chan(dd->dev, "rx1");
if (IS_ERR(dd->dma_rx1)) {
if (PTR_ERR(dd->dma_rx1) != -EPROBE_DEFER)
dev_err(dd->dev, "Unable to request rx1 DMA channel\n");
return PTR_ERR(dd->dma_rx1);
}
if (IS_ERR(dd->dma_rx1))
return dev_err_probe(dd->dev, PTR_ERR(dd->dma_rx1),
"Unable to request rx1 DMA channel\n");
dd->dma_rx2 = dma_request_chan(dd->dev, "rx2");
if (IS_ERR(dd->dma_rx2)) {
dma_release_channel(dd->dma_rx1);
if (PTR_ERR(dd->dma_rx2) != -EPROBE_DEFER)
dev_err(dd->dev, "Unable to request rx2 DMA channel\n");
return PTR_ERR(dd->dma_rx2);
return dev_err_probe(dd->dev, PTR_ERR(dd->dma_rx2),
"Unable to request rx2 DMA channel\n");
}
dd->dma_tx = dma_request_chan(dd->dev, "tx");
if (IS_ERR(dd->dma_tx)) {
if (PTR_ERR(dd->dma_tx) != -EPROBE_DEFER)
dev_err(dd->dev, "Unable to request tx DMA channel\n");
ret = PTR_ERR(dd->dma_tx);
ret = dev_err_probe(dd->dev, PTR_ERR(dd->dma_tx),
"Unable to request tx DMA channel\n");
goto err_dma_tx;
}