aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto/caam/ctrl.c
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-08-21 12:52:00 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2015-08-24 10:07:42 -0400
commit9c4f9733e26f0d6977096fcafe71ea2ba9f0cd7c (patch)
tree4022ae408c94a729cc5483c851d028ced580847b /drivers/crypto/caam/ctrl.c
parenta3c09550f0cbd9965e44a2dc62c85ff5db91f8ff (diff)
crypto: caam - Use the preferred style for memory allocations
"The preferred form for passing a size of a struct is the following: p = kmalloc(sizeof(*p), ...); .... The preferred form for allocating a zeroed array is the following: p = kcalloc(n, sizeof(...), ...); " ,so do as suggested. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Horia Geant? <horia.geanta@freescale.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/caam/ctrl.c')
-rw-r--r--drivers/crypto/caam/ctrl.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 50594bac0055..8abb4bc548cc 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -424,8 +424,7 @@ static int caam_probe(struct platform_device *pdev)
424 int pg_size; 424 int pg_size;
425 int BLOCK_OFFSET = 0; 425 int BLOCK_OFFSET = 0;
426 426
427 ctrlpriv = devm_kzalloc(&pdev->dev, sizeof(struct caam_drv_private), 427 ctrlpriv = devm_kzalloc(&pdev->dev, sizeof(*ctrlpriv), GFP_KERNEL);
428 GFP_KERNEL);
429 if (!ctrlpriv) 428 if (!ctrlpriv)
430 return -ENOMEM; 429 return -ENOMEM;
431 430
@@ -583,9 +582,8 @@ static int caam_probe(struct platform_device *pdev)
583 of_device_is_compatible(np, "fsl,sec4.0-job-ring")) 582 of_device_is_compatible(np, "fsl,sec4.0-job-ring"))
584 rspec++; 583 rspec++;
585 584
586 ctrlpriv->jrpdev = devm_kzalloc(&pdev->dev, 585 ctrlpriv->jrpdev = devm_kcalloc(&pdev->dev, rspec,
587 sizeof(struct platform_device *) * rspec, 586 sizeof(*ctrlpriv->jrpdev), GFP_KERNEL);
588 GFP_KERNEL);
589 if (ctrlpriv->jrpdev == NULL) { 587 if (ctrlpriv->jrpdev == NULL) {
590 ret = -ENOMEM; 588 ret = -ENOMEM;
591 goto iounmap_ctrl; 589 goto iounmap_ctrl;