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>

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 83d2306ce7ab18ae0c6c1a5aeafbd80d020e161e..ba79d638f78200a189bda8763f2997222d60709d 100644 (file)
--- 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
        struct caam_crypto_alg *t_alg;
        struct crypto_alg *alg;
 
-       t_alg = kzalloc(sizeof(struct caam_crypto_alg), GFP_KERNEL);
+       t_alg = kzalloc(sizeof(*t_alg), GFP_KERNEL);
        if (!t_alg) {
                pr_err("failed to allocate t_alg\n");
                return ERR_PTR(-ENOMEM);

diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index bb0935a3817c7f2b88eea9ccd07929487f63a9c4..72acf8e5ac2fe6160ea963a0ee3dd11b4872dabe 100644 (file)
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -1841,7 +1841,7 @@ caam_hash_alloc(struct caam_hash_template *template,
        struct ahash_alg *halg;
        struct crypto_alg *alg;
 
-       t_alg = kzalloc(sizeof(struct caam_hash_alg), GFP_KERNEL);
+       t_alg = kzalloc(sizeof(*t_alg), GFP_KERNEL);
        if (!t_alg) {
                pr_err("failed to allocate t_alg\n");
                return ERR_PTR(-ENOMEM);

diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c
index fb0cc54fa70cc8223edef4cf6988955d4715b4e0..9b92af2c72412fd05390da752956c9e52d84014d 100644 (file)
--- a/drivers/crypto/caam/caamrng.c
+++ b/drivers/crypto/caam/caamrng.c
@@ -351,7 +351,7 @@ static int __init caam_rng_init(void)
                pr_err("Job Ring Device allocation for transform failed\n");
                return PTR_ERR(dev);
        }
-       rng_ctx = kmalloc(sizeof(struct caam_rng_ctx), GFP_DMA);
+       rng_ctx = kmalloc(sizeof(*rng_ctx), GFP_DMA);
        if (!rng_ctx) {
                err = -ENOMEM;
                goto free_caam_alloc;

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 50594bac0055d341d93c91f316ff04e362418b4a..8abb4bc548cc06a7a8ae97779701d308255ff050 100644 (file)
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -424,8 +424,7 @@ static int caam_probe(struct platform_device *pdev)
        int pg_size;
        int BLOCK_OFFSET = 0;
 
-       ctrlpriv = devm_kzalloc(&pdev->dev, sizeof(struct caam_drv_private),
-                               GFP_KERNEL);
+       ctrlpriv = devm_kzalloc(&pdev->dev, sizeof(*ctrlpriv), GFP_KERNEL);
        if (!ctrlpriv)
                return -ENOMEM;
 
@@ -583,9 +582,8 @@ static int caam_probe(struct platform_device *pdev)
                    of_device_is_compatible(np, "fsl,sec4.0-job-ring"))
                        rspec++;
 
-       ctrlpriv->jrpdev = devm_kzalloc(&pdev->dev,
-                                       sizeof(struct platform_device *) * rspec,
-                                       GFP_KERNEL);
+       ctrlpriv->jrpdev = devm_kcalloc(&pdev->dev, rspec,
+                                       sizeof(*ctrlpriv->jrpdev), GFP_KERNEL);
        if (ctrlpriv->jrpdev == NULL) {
                ret = -ENOMEM;
                goto iounmap_ctrl;

diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index b7ec1ad38841b6305640ef04c443c6383bbb457a..f7e0d8d4c3da12cebdfb1df13822eb86da081307 100644 (file)
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -410,18 +410,17 @@ static int caam_jr_init(struct device *dev)
                goto out_free_irq;
 
        error = -ENOMEM;
-       jrp->inpring = dma_alloc_coherent(dev, sizeof(dma_addr_t) * JOBR_DEPTH,
-                                         &inpbusaddr, GFP_KERNEL);
+       jrp->inpring = dma_alloc_coherent(dev, sizeof(*jrp->inpring) *
+                                         JOBR_DEPTH, &inpbusaddr, GFP_KERNEL);
        if (!jrp->inpring)
                goto out_free_irq;
 
-       jrp->outring = dma_alloc_coherent(dev, sizeof(struct jr_outentry) *
+       jrp->outring = dma_alloc_coherent(dev, sizeof(*jrp->outring) *
                                          JOBR_DEPTH, &outbusaddr, GFP_KERNEL);
        if (!jrp->outring)
                goto out_free_inpring;
 
-       jrp->entinfo = kzalloc(sizeof(struct caam_jrentry_info) * JOBR_DEPTH,
-                              GFP_KERNEL);
+       jrp->entinfo = kcalloc(JOBR_DEPTH, sizeof(*jrp->entinfo), GFP_KERNEL);
        if (!jrp->entinfo)
                goto out_free_outring;
 
@@ -479,8 +478,7 @@ static int caam_jr_probe(struct platform_device *pdev)
        int error;
 
        jrdev = &pdev->dev;
-       jrpriv = devm_kmalloc(jrdev, sizeof(struct caam_drv_private_jr),
-                             GFP_KERNEL);
+       jrpriv = devm_kmalloc(jrdev, sizeof(*jrpriv), GFP_KERNEL);
        if (!jrpriv)
                return -ENOMEM;