diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2015-08-21 12:52:00 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-08-24 10:07:42 -0400 |
| commit | 9c4f9733e26f0d6977096fcafe71ea2ba9f0cd7c (patch) | |
| tree | 4022ae408c94a729cc5483c851d028ced580847b | |
| parent | a3c09550f0cbd9965e44a2dc62c85ff5db91f8ff (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>
| -rw-r--r-- | drivers/crypto/caam/caamalg.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/caam/caamhash.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/caam/caamrng.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/caam/ctrl.c | 8 | ||||
| -rw-r--r-- | drivers/crypto/caam/jr.c | 12 |
5 files changed, 11 insertions, 15 deletions
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 83d2306ce7ab..ba79d638f782 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c | |||
| @@ -4314,7 +4314,7 @@ static struct caam_crypto_alg *caam_alg_alloc(struct caam_alg_template | |||
| 4314 | struct caam_crypto_alg *t_alg; | 4314 | struct caam_crypto_alg *t_alg; |
| 4315 | struct crypto_alg *alg; | 4315 | struct crypto_alg *alg; |
| 4316 | 4316 | ||
| 4317 | t_alg = kzalloc(sizeof(struct caam_crypto_alg), GFP_KERNEL); | 4317 | t_alg = kzalloc(sizeof(*t_alg), GFP_KERNEL); |
| 4318 | if (!t_alg) { | 4318 | if (!t_alg) { |
| 4319 | pr_err("failed to allocate t_alg\n"); | 4319 | pr_err("failed to allocate t_alg\n"); |
| 4320 | return ERR_PTR(-ENOMEM); | 4320 | return ERR_PTR(-ENOMEM); |
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index bb0935a3817c..72acf8e5ac2f 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c | |||
| @@ -1841,7 +1841,7 @@ caam_hash_alloc(struct caam_hash_template *template, | |||
| 1841 | struct ahash_alg *halg; | 1841 | struct ahash_alg *halg; |
| 1842 | struct crypto_alg *alg; | 1842 | struct crypto_alg *alg; |
| 1843 | 1843 | ||
| 1844 | t_alg = kzalloc(sizeof(struct caam_hash_alg), GFP_KERNEL); | 1844 | t_alg = kzalloc(sizeof(*t_alg), GFP_KERNEL); |
| 1845 | if (!t_alg) { | 1845 | if (!t_alg) { |
| 1846 | pr_err("failed to allocate t_alg\n"); | 1846 | pr_err("failed to allocate t_alg\n"); |
| 1847 | return ERR_PTR(-ENOMEM); | 1847 | return ERR_PTR(-ENOMEM); |
diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c index fb0cc54fa70c..9b92af2c7241 100644 --- a/drivers/crypto/caam/caamrng.c +++ b/drivers/crypto/caam/caamrng.c | |||
| @@ -351,7 +351,7 @@ static int __init caam_rng_init(void) | |||
| 351 | pr_err("Job Ring Device allocation for transform failed\n"); | 351 | pr_err("Job Ring Device allocation for transform failed\n"); |
| 352 | return PTR_ERR(dev); | 352 | return PTR_ERR(dev); |
| 353 | } | 353 | } |
| 354 | rng_ctx = kmalloc(sizeof(struct caam_rng_ctx), GFP_DMA); | 354 | rng_ctx = kmalloc(sizeof(*rng_ctx), GFP_DMA); |
| 355 | if (!rng_ctx) { | 355 | if (!rng_ctx) { |
| 356 | err = -ENOMEM; | 356 | err = -ENOMEM; |
| 357 | goto free_caam_alloc; | 357 | goto free_caam_alloc; |
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; |
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c index b7ec1ad38841..f7e0d8d4c3da 100644 --- a/drivers/crypto/caam/jr.c +++ b/drivers/crypto/caam/jr.c | |||
| @@ -410,18 +410,17 @@ static int caam_jr_init(struct device *dev) | |||
| 410 | goto out_free_irq; | 410 | goto out_free_irq; |
| 411 | 411 | ||
| 412 | error = -ENOMEM; | 412 | error = -ENOMEM; |
| 413 | jrp->inpring = dma_alloc_coherent(dev, sizeof(dma_addr_t) * JOBR_DEPTH, | 413 | jrp->inpring = dma_alloc_coherent(dev, sizeof(*jrp->inpring) * |
| 414 | &inpbusaddr, GFP_KERNEL); | 414 | JOBR_DEPTH, &inpbusaddr, GFP_KERNEL); |
| 415 | if (!jrp->inpring) | 415 | if (!jrp->inpring) |
| 416 | goto out_free_irq; | 416 | goto out_free_irq; |
| 417 | 417 | ||
| 418 | jrp->outring = dma_alloc_coherent(dev, sizeof(struct jr_outentry) * | 418 | jrp->outring = dma_alloc_coherent(dev, sizeof(*jrp->outring) * |
| 419 | JOBR_DEPTH, &outbusaddr, GFP_KERNEL); | 419 | JOBR_DEPTH, &outbusaddr, GFP_KERNEL); |
| 420 | if (!jrp->outring) | 420 | if (!jrp->outring) |
| 421 | goto out_free_inpring; | 421 | goto out_free_inpring; |
| 422 | 422 | ||
| 423 | jrp->entinfo = kzalloc(sizeof(struct caam_jrentry_info) * JOBR_DEPTH, | 423 | jrp->entinfo = kcalloc(JOBR_DEPTH, sizeof(*jrp->entinfo), GFP_KERNEL); |
| 424 | GFP_KERNEL); | ||
| 425 | if (!jrp->entinfo) | 424 | if (!jrp->entinfo) |
| 426 | goto out_free_outring; | 425 | goto out_free_outring; |
| 427 | 426 | ||
| @@ -479,8 +478,7 @@ static int caam_jr_probe(struct platform_device *pdev) | |||
| 479 | int error; | 478 | int error; |
| 480 | 479 | ||
| 481 | jrdev = &pdev->dev; | 480 | jrdev = &pdev->dev; |
| 482 | jrpriv = devm_kmalloc(jrdev, sizeof(struct caam_drv_private_jr), | 481 | jrpriv = devm_kmalloc(jrdev, sizeof(*jrpriv), GFP_KERNEL); |
| 483 | GFP_KERNEL); | ||
| 484 | if (!jrpriv) | 482 | if (!jrpriv) |
| 485 | return -ENOMEM; | 483 | return -ENOMEM; |
| 486 | 484 | ||