mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
crypto: atmel-sha - Switch to managed version of kzalloc
This patch switches data allocation from kzalloc to devm_kzalloc. It also removed some kfree() on data that was earlier allocated using devm_kzalloc(). CC: Herbert Xu <[email protected]> CC: "David S. Miller" <[email protected]> CC: Grant Likely <[email protected]> CC: Rob Herring <[email protected]> CC: Nicolas Ferre <[email protected]> Signed-off-by: Pramod Gurav <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
This commit is contained in:
parent
3b9b8fe0ad
commit
593901aa04
1 changed files with 2 additions and 7 deletions
|
|
@ -1353,7 +1353,6 @@ static struct crypto_platform_data *atmel_sha_of_init(struct platform_device *pd
|
|||
GFP_KERNEL);
|
||||
if (!pdata->dma_slave) {
|
||||
dev_err(&pdev->dev, "could not allocate memory for dma_slave\n");
|
||||
devm_kfree(&pdev->dev, pdata);
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
|
|
@ -1375,7 +1374,8 @@ static int atmel_sha_probe(struct platform_device *pdev)
|
|||
unsigned long sha_phys_size;
|
||||
int err;
|
||||
|
||||
sha_dd = kzalloc(sizeof(struct atmel_sha_dev), GFP_KERNEL);
|
||||
sha_dd = devm_kzalloc(&pdev->dev, sizeof(struct atmel_sha_dev),
|
||||
GFP_KERNEL);
|
||||
if (sha_dd == NULL) {
|
||||
dev_err(dev, "unable to alloc data struct.\n");
|
||||
err = -ENOMEM;
|
||||
|
|
@ -1490,8 +1490,6 @@ clk_err:
|
|||
free_irq(sha_dd->irq, sha_dd);
|
||||
res_err:
|
||||
tasklet_kill(&sha_dd->done_task);
|
||||
kfree(sha_dd);
|
||||
sha_dd = NULL;
|
||||
sha_dd_err:
|
||||
dev_err(dev, "initialization failed.\n");
|
||||
|
||||
|
|
@ -1523,9 +1521,6 @@ static int atmel_sha_remove(struct platform_device *pdev)
|
|||
if (sha_dd->irq >= 0)
|
||||
free_irq(sha_dd->irq, sha_dd);
|
||||
|
||||
kfree(sha_dd);
|
||||
sha_dd = NULL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue