system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 11:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Tudor Ambarus 2019-12-05 09:53:51 +00:00 committed by Herbert Xu
parent 0efe58f3e9
commit c9063a0281
3 changed files with 8 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/crypto/atmel-aes.c
View file

@ -2595,17 +2595,13 @@ static int atmel_aes_probe(struct platform_device *pdev)
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
if (!pdata) { if (!pdata) {
pdata = atmel_aes_of_init(pdev); pdata = atmel_aes_of_init(pdev);
if (IS_ERR(pdata)) { if (IS_ERR(pdata))
err = PTR_ERR(pdata); return PTR_ERR(pdata);
goto aes_dd_err;
}
} }
aes_dd = devm_kzalloc(&pdev->dev, sizeof(*aes_dd), GFP_KERNEL); aes_dd = devm_kzalloc(&pdev->dev, sizeof(*aes_dd), GFP_KERNEL);
if (aes_dd == NULL) { if (!aes_dd)
err = -ENOMEM; return -ENOMEM;
goto aes_dd_err;
}
aes_dd->dev = dev; aes_dd->dev = dev;
@ -2711,9 +2707,6 @@ static int atmel_aes_probe(struct platform_device *pdev)
res_err: res_err:
tasklet_kill(&aes_dd->done_task); tasklet_kill(&aes_dd->done_task);
tasklet_kill(&aes_dd->queue_task); tasklet_kill(&aes_dd->queue_task);
aes_dd_err:
if (err != -EPROBE_DEFER)
dev_err(dev, "initialization failed.\n");
return err; return err;
} }

8
drivers/crypto/atmel-sha.c
View file

@ -2734,10 +2734,8 @@ static int atmel_sha_probe(struct platform_device *pdev)
int err; int err;
sha_dd = devm_kzalloc(&pdev->dev, sizeof(*sha_dd), GFP_KERNEL); sha_dd = devm_kzalloc(&pdev->dev, sizeof(*sha_dd), GFP_KERNEL);
if (sha_dd == NULL) { if (!sha_dd)
err = -ENOMEM; return -ENOMEM;
goto sha_dd_err;
}
sha_dd->dev = dev; sha_dd->dev = dev;
@ -2846,8 +2844,6 @@ static int atmel_sha_probe(struct platform_device *pdev)
res_err: res_err:
tasklet_kill(&sha_dd->queue_task); tasklet_kill(&sha_dd->queue_task);
tasklet_kill(&sha_dd->done_task); tasklet_kill(&sha_dd->done_task);
sha_dd_err:
dev_err(dev, "initialization failed.\n");
return err; return err;
} }

8
drivers/crypto/atmel-tdes.c
View file

@ -1240,10 +1240,8 @@ static int atmel_tdes_probe(struct platform_device *pdev)
int err; int err;
tdes_dd = devm_kmalloc(&pdev->dev, sizeof(*tdes_dd), GFP_KERNEL); tdes_dd = devm_kmalloc(&pdev->dev, sizeof(*tdes_dd), GFP_KERNEL);
if (tdes_dd == NULL) { if (!tdes_dd)
err = -ENOMEM; return -ENOMEM;
goto tdes_dd_err;
}
tdes_dd->dev = dev; tdes_dd->dev = dev;
@ -1352,8 +1350,6 @@ static int atmel_tdes_probe(struct platform_device *pdev)
res_err: res_err:
tasklet_kill(&tdes_dd->done_task); tasklet_kill(&tdes_dd->done_task);
tasklet_kill(&tdes_dd->queue_task); tasklet_kill(&tdes_dd->queue_task);
tdes_dd_err:
dev_err(dev, "initialization failed.\n");
return err; return err;
} }