summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/atmel-aes.c
diff options
context:
space:
mode:
authorTudor Ambarus <tudor.ambarus@microchip.com>2019-12-05 09:53:51 +0000
committerHerbert Xu <herbert@gondor.apana.org.au>2019-12-11 16:44:32 +0800
commitc9063a0281d98cb3b542f6a0ae20812f0597a365 (patch)
tree02ea7e8cb2fe1bcb88c36aa7d9dab8fa4139fddf /drivers/crypto/atmel-aes.c
parent0efe58f3e9c8552f996d4f07b29393b3392731cf (diff)
downloadlinux-stable-c9063a0281d98cb3b542f6a0ae20812f0597a365.tar.gz
linux-stable-c9063a0281d98cb3b542f6a0ae20812f0597a365.tar.bz2
linux-stable-c9063a0281d98cb3b542f6a0ae20812f0597a365.zip
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>
Diffstat (limited to 'drivers/crypto/atmel-aes.c')
-rw-r--r--drivers/crypto/atmel-aes.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c
index d0da55f0880c..18392632d691 100644
--- 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;
}