2017-04-19 07:29:49

by SF Markus Elfring

[permalink] [raw]
Subject: [PATCH] bus: arm-ccn: Use devm_kcalloc() in arm_ccn_probe()

From: Markus Elfring <[email protected]>
Date: Wed, 19 Apr 2017 09:12:43 +0200

Multiplications for the size determination of memory allocations
indicated that array data structures should be processed.
Thus use the corresponding function "devm_kcalloc".

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <[email protected]>
---
drivers/bus/arm-ccn.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c
index 4d6a2b7e4d3f..6375bda0b2a1 100644
--- a/drivers/bus/arm-ccn.c
+++ b/drivers/bus/arm-ccn.c
@@ -1520,10 +1520,10 @@ static int arm_ccn_probe(struct platform_device *pdev)
if (err)
return err;

- ccn->node = devm_kzalloc(ccn->dev, sizeof(*ccn->node) * ccn->num_nodes,
- GFP_KERNEL);
- ccn->xp = devm_kzalloc(ccn->dev, sizeof(*ccn->node) * ccn->num_xps,
- GFP_KERNEL);
+ ccn->node = devm_kcalloc(ccn->dev, ccn->num_nodes, sizeof(*ccn->node),
+ GFP_KERNEL);
+ ccn->xp = devm_kcalloc(ccn->dev, ccn->num_xps, sizeof(*ccn->node),
+ GFP_KERNEL);
if (!ccn->node || !ccn->xp)
return -ENOMEM;

--
2.12.2


2017-04-19 08:23:52

by Mark Rutland

[permalink] [raw]
Subject: Re: [PATCH] bus: arm-ccn: Use devm_kcalloc() in arm_ccn_probe()

On Wed, Apr 19, 2017 at 09:29:24AM +0200, SF Markus Elfring wrote:
> From: Markus Elfring <[email protected]>
> Date: Wed, 19 Apr 2017 09:12:43 +0200
>
> Multiplications for the size determination of memory allocations
> indicated that array data structures should be processed.
> Thus use the corresponding function "devm_kcalloc".
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <[email protected]>

This looks reasonable to me. FWIW:

Acked-by: Mark Rutland <[email protected]>

I'll leave the final say to Pawel.

Mark.

> ---
> drivers/bus/arm-ccn.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c
> index 4d6a2b7e4d3f..6375bda0b2a1 100644
> --- a/drivers/bus/arm-ccn.c
> +++ b/drivers/bus/arm-ccn.c
> @@ -1520,10 +1520,10 @@ static int arm_ccn_probe(struct platform_device *pdev)
> if (err)
> return err;
>
> - ccn->node = devm_kzalloc(ccn->dev, sizeof(*ccn->node) * ccn->num_nodes,
> - GFP_KERNEL);
> - ccn->xp = devm_kzalloc(ccn->dev, sizeof(*ccn->node) * ccn->num_xps,
> - GFP_KERNEL);
> + ccn->node = devm_kcalloc(ccn->dev, ccn->num_nodes, sizeof(*ccn->node),
> + GFP_KERNEL);
> + ccn->xp = devm_kcalloc(ccn->dev, ccn->num_xps, sizeof(*ccn->node),
> + GFP_KERNEL);
> if (!ccn->node || !ccn->xp)
> return -ENOMEM;
>
> --
> 2.12.2
>

2017-04-19 13:04:30

by Pawel Moll

[permalink] [raw]
Subject: Re: [PATCH] bus: arm-ccn: Use devm_kcalloc() in arm_ccn_probe()

On Wed, 2017-04-19 at 09:29 +0200, SF Markus Elfring wrote:
> From: Markus Elfring <[email protected]>
> Date: Wed, 19 Apr 2017 09:12:43 +0200
>
> Multiplications for the size determination of memory allocations
> indicated that array data structures should be processed.
> Thus use the corresponding function "devm_kcalloc".
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <[email protected]>

Fine with me. I'll queue it with a couple other CCN driver changes.
Will probably get into 4.13.

Regards!

Pawel