crypto: sa2ul - Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Wed, 26 Aug 2020 16:29:53 +0000 (18:29 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 4 Sep 2020 07:57:16 +0000 (17:57 +1000)
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>
drivers/crypto/sa2ul.c

index acabb8ddacb6b455524e11eebfad6db5e5aae396..b685a76ae88ccbf237d316796a54e6065039b43f 100644 (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;
        }