2014-07-28 12:12:30

by Pramod Gurav

Subject: [PATCH] crypto: atmel-sha: Switch to managed version of kzalloc

From: Pramod Gurav <[email protected]>

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]>
---
drivers/crypto/atmel-sha.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c
index 0618be0..9a4f69e 100644
--- a/drivers/crypto/atmel-sha.c
+++ b/drivers/crypto/atmel-sha.c
@@ -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;
}

--
1.7.9.5

2014-08-01 14:40:35

by Herbert Xu

Subject: Re: [PATCH] crypto: atmel-sha: Switch to managed version of kzalloc

On Mon, Jul 28, 2014 at 05:45:56PM +0530, [email protected] wrote:
> From: Pramod Gurav <[email protected]>
>
> 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]>

Both patches applied.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt