crypto: sun8i - Simplify with dev_err_probe()

Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and the error value gets printed.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c
index 138759dc8190e93b62947511f24aef13d88ca276..e3c62051c59547863b5ef831d06f1f27c53c0700 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c
+++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c
@@ -573,12 +573,9 @@ static int sun8i_ce_probe(struct platform_device *pdev)
                return irq;
 
        ce->reset = devm_reset_control_get(&pdev->dev, NULL);
-       if (IS_ERR(ce->reset)) {
-               if (PTR_ERR(ce->reset) == -EPROBE_DEFER)
-                       return PTR_ERR(ce->reset);
-               dev_err(&pdev->dev, "No reset control found\n");
-               return PTR_ERR(ce->reset);
-       }
+       if (IS_ERR(ce->reset))
+               return dev_err_probe(&pdev->dev, PTR_ERR(ce->reset),
+                                    "No reset control found\n");
 
        mutex_init(&ce->mlock);
 

diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c
index 9a23515783a6cdae74b3a76760032ea8bd05432e..576df8c8df51234518770d683063a003dfe69463 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c
+++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c
@@ -545,12 +545,9 @@ static int sun8i_ss_probe(struct platform_device *pdev)
                return irq;
 
        ss->reset = devm_reset_control_get(&pdev->dev, NULL);
-       if (IS_ERR(ss->reset)) {
-               if (PTR_ERR(ss->reset) == -EPROBE_DEFER)
-                       return PTR_ERR(ss->reset);
-               dev_err(&pdev->dev, "No reset control found\n");
-               return PTR_ERR(ss->reset);
-       }
+       if (IS_ERR(ss->reset))
+               return dev_err_probe(&pdev->dev, PTR_ERR(ss->reset),
+                                    "No reset control found\n");
 
        mutex_init(&ss->mlock);