[PATCH] gpio: mockup: use devm_kcalloc() where applicable

[PATCH] gpio: mockup: use devm_kcalloc() where applicable

[Bartosz Golaszewski]

This is a follow up to [1]. The patch proposes to use devm_kcalloc()
when allocating arrays of elements.

Bartosz Golaszewski (1):
  gpio: mockup: use devm_kcalloc() where applicable

 drivers/gpio/gpio-mockup.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
2.9.3

[PATCH] gpio: mockup: use devm_kcalloc() where applicable

[Bartosz Golaszewski]

When allocating a zeroed array of objects use devm_kcalloc() instead
of manually calculating the required size and using devm_kzalloc().

Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
---
 drivers/gpio/gpio-mockup.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c
index 536a229..a6565e1 100644
--- a/drivers/gpio/gpio-mockup.c
+++ b/drivers/gpio/gpio-mockup.c
@@ -128,7 +128,7 @@ static int gpio_mockup_name_lines(struct device *dev,
 	char **names;
 	int i;
 
-	names = devm_kzalloc(dev, sizeof(char *) * gc->ngpio, GFP_KERNEL);
+	names = devm_kcalloc(dev, gc->ngpio, sizeof(char *), GFP_KERNEL);
 	if (!names)
 		return -ENOMEM;
 
@@ -308,8 +308,8 @@ static int gpio_mockup_add(struct device *dev,
 	gc->get_direction = gpio_mockup_get_direction;
 	gc->to_irq = gpio_mockup_to_irq;
 
-	chip->lines = devm_kzalloc(dev, sizeof(*chip->lines) * gc->ngpio,
-				   GFP_KERNEL);
+	chip->lines = devm_kcalloc(dev, gc->ngpio,
+				   sizeof(*chip->lines), GFP_KERNEL);
 	if (!chip->lines)
 		return -ENOMEM;
 
@@ -346,7 +346,7 @@ static int gpio_mockup_probe(struct platform_device *pdev)
 	/* Each chip is described by two values. */
 	num_chips = gpio_mockup_params_nr / 2;
 
-	chips = devm_kzalloc(dev, sizeof(*chips) * num_chips, GFP_KERNEL);
+	chips = devm_kcalloc(dev, num_chips, sizeof(*chips), GFP_KERNEL);
 	if (!chips)
 		return -ENOMEM;
 
-- 
2.9.3

Re: [PATCH] gpio: mockup: use devm_kcalloc() where applicable

[Linus Walleij]

On Thu, Jun 1, 2017 at 1:47 PM, Bartosz Golaszewski <brgl@bgdev.pl> wrote:

> When allocating a zeroed array of objects use devm_kcalloc() instead
> of manually calculating the required size and using devm_kzalloc().
>
> Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>

This does not apply on the GPIO "devel" branch in my tree,
probably because of other patches from you :)

Could you rebase and resend?

Yours,
Linus Walleij

Re: [PATCH] gpio: mockup: use devm_kcalloc() where applicable

[Bartosz Golaszewski]

2017-06-09 10:06 GMT+02:00 Linus Walleij <linus.walleij@linaro.org>:
> On Thu, Jun 1, 2017 at 1:47 PM, Bartosz Golaszewski <brgl@bgdev.pl> wrote:
>
>> When allocating a zeroed array of objects use devm_kcalloc() instead
>> of manually calculating the required size and using devm_kzalloc().
>>
>> Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
>
> This does not apply on the GPIO "devel" branch in my tree,
> probably because of other patches from you :)
>
> Could you rebase and resend?
>
> Yours,
> Linus Walleij

I thought you would apply the previous patches first, but sure, I'll resend.

Thanks,
Bartosz

Re: [PATCH] gpio: mockup: use devm_kcalloc() where applicable

[Bartosz Golaszewski]

2017-06-01 13:47 GMT+02:00 Bartosz Golaszewski <brgl@bgdev.pl>:
> This is a follow up to [1]. The patch proposes to use devm_kcalloc()
> when allocating arrays of elements.
>
> Bartosz Golaszewski (1):
>   gpio: mockup: use devm_kcalloc() where applicable
>
>  drivers/gpio/gpio-mockup.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> --
> 2.9.3
>

[1] https://lkml.org/lkml/2017/5/30/180