crypto: atmel-{aes,sha,tdes} - Drop superfluous error message in probe()

In case the probe fails, the device/driver core takes care of printing
the driver name, device name and error code. Drop superfluous error message
at probe.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c
index d0da55f..1839263 100644 (file)
--- a/drivers/crypto/atmel-aes.c
+++ b/drivers/crypto/atmel-aes.c
@@ -2595,17 +2595,13 @@ static int atmel_aes_probe(struct platform_device *pdev)
        pdata = pdev->dev.platform_data;
        if (!pdata) {
                pdata = atmel_aes_of_init(pdev);
-               if (IS_ERR(pdata)) {
-                       err = PTR_ERR(pdata);
-                       goto aes_dd_err;
-               }
+               if (IS_ERR(pdata))
+                       return PTR_ERR(pdata);
        }
 
        aes_dd = devm_kzalloc(&pdev->dev, sizeof(*aes_dd), GFP_KERNEL);
-       if (aes_dd == NULL) {
-               err = -ENOMEM;
-               goto aes_dd_err;
-       }
+       if (!aes_dd)
+               return -ENOMEM;
 
        aes_dd->dev = dev;
 
@@ -2711,9 +2707,6 @@ iclk_unprepare:
 res_err:
        tasklet_kill(&aes_dd->done_task);
        tasklet_kill(&aes_dd->queue_task);
-aes_dd_err:
-       if (err != -EPROBE_DEFER)
-               dev_err(dev, "initialization failed.\n");
 
        return err;
 }

diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c
index 48ec0af..7980b89 100644 (file)
--- a/drivers/crypto/atmel-sha.c
+++ b/drivers/crypto/atmel-sha.c
@@ -2734,10 +2734,8 @@ static int atmel_sha_probe(struct platform_device *pdev)
        int err;
 
        sha_dd = devm_kzalloc(&pdev->dev, sizeof(*sha_dd), GFP_KERNEL);
-       if (sha_dd == NULL) {
-               err = -ENOMEM;
-               goto sha_dd_err;
-       }
+       if (!sha_dd)
+               return -ENOMEM;
 
        sha_dd->dev = dev;
 
@@ -2846,8 +2844,6 @@ iclk_unprepare:
 res_err:
        tasklet_kill(&sha_dd->queue_task);
        tasklet_kill(&sha_dd->done_task);
-sha_dd_err:
-       dev_err(dev, "initialization failed.\n");
 
        return err;
 }

diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c
index 06eaa91..4cf3432 100644 (file)
--- a/drivers/crypto/atmel-tdes.c
+++ b/drivers/crypto/atmel-tdes.c
@@ -1240,10 +1240,8 @@ static int atmel_tdes_probe(struct platform_device *pdev)
        int err;
 
        tdes_dd = devm_kmalloc(&pdev->dev, sizeof(*tdes_dd), GFP_KERNEL);
-       if (tdes_dd == NULL) {
-               err = -ENOMEM;
-               goto tdes_dd_err;
-       }
+       if (!tdes_dd)
+               return -ENOMEM;
 
        tdes_dd->dev = dev;
 
@@ -1352,8 +1350,6 @@ err_tdes_buff:
 res_err:
        tasklet_kill(&tdes_dd->done_task);
        tasklet_kill(&tdes_dd->queue_task);
-tdes_dd_err:
-       dev_err(dev, "initialization failed.\n");
 
        return err;
 }