aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPramod Gurav <pramod.gurav@smartplayin.com>2014-07-28 08:16:33 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2014-08-01 10:36:12 -0400
commitc659d07f11a359aa053e35d3ee549289c86fab64 (patch)
tree6d4247acec127af817957a339fe5c7596dd7df0e
parent593901aa046b175e2948d361e439e13e58036146 (diff)
crypto: atmel-tdes - Switch to managed version of kzalloc
This patch switches data allocation from kzalloc to devm_kzalloc. It also removes some kfree() on data that was earlier allocated using devm_kzalloc() from probe as well as remove funtions. CC: Herbert Xu <herbert@gondor.apana.org.au> CC: "David S. Miller" <davem@davemloft.net> CC: Grant Likely <grant.likely@linaro.org> CC: Rob Herring <robh+dt@kernel.org> Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/atmel-tdes.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c
index 6cde5b530c69..d3a9041938ea 100644
--- a/drivers/crypto/atmel-tdes.c
+++ b/drivers/crypto/atmel-tdes.c
@@ -1337,7 +1337,6 @@ static struct crypto_platform_data *atmel_tdes_of_init(struct platform_device *p
1337 GFP_KERNEL); 1337 GFP_KERNEL);
1338 if (!pdata->dma_slave) { 1338 if (!pdata->dma_slave) {
1339 dev_err(&pdev->dev, "could not allocate memory for dma_slave\n"); 1339 dev_err(&pdev->dev, "could not allocate memory for dma_slave\n");
1340 devm_kfree(&pdev->dev, pdata);
1341 return ERR_PTR(-ENOMEM); 1340 return ERR_PTR(-ENOMEM);
1342 } 1341 }
1343 1342
@@ -1359,7 +1358,7 @@ static int atmel_tdes_probe(struct platform_device *pdev)
1359 unsigned long tdes_phys_size; 1358 unsigned long tdes_phys_size;
1360 int err; 1359 int err;
1361 1360
1362 tdes_dd = kzalloc(sizeof(struct atmel_tdes_dev), GFP_KERNEL); 1361 tdes_dd = devm_kmalloc(&pdev->dev, sizeof(*tdes_dd), GFP_KERNEL);
1363 if (tdes_dd == NULL) { 1362 if (tdes_dd == NULL) {
1364 dev_err(dev, "unable to alloc data struct.\n"); 1363 dev_err(dev, "unable to alloc data struct.\n");
1365 err = -ENOMEM; 1364 err = -ENOMEM;
@@ -1483,8 +1482,6 @@ tdes_irq_err:
1483res_err: 1482res_err:
1484 tasklet_kill(&tdes_dd->done_task); 1483 tasklet_kill(&tdes_dd->done_task);
1485 tasklet_kill(&tdes_dd->queue_task); 1484 tasklet_kill(&tdes_dd->queue_task);
1486 kfree(tdes_dd);
1487 tdes_dd = NULL;
1488tdes_dd_err: 1485tdes_dd_err:
1489 dev_err(dev, "initialization failed.\n"); 1486 dev_err(dev, "initialization failed.\n");
1490 1487
@@ -1519,9 +1516,6 @@ static int atmel_tdes_remove(struct platform_device *pdev)
1519 if (tdes_dd->irq >= 0) 1516 if (tdes_dd->irq >= 0)
1520 free_irq(tdes_dd->irq, tdes_dd); 1517 free_irq(tdes_dd->irq, tdes_dd);
1521 1518
1522 kfree(tdes_dd);
1523 tdes_dd = NULL;
1524
1525 return 0; 1519 return 0;
1526} 1520}
1527 1521