]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
gpio: mockup: use devm_kcalloc() where applicable
authorBartosz Golaszewski <brgl@bgdev.pl>
Fri, 9 Jun 2017 11:41:32 +0000 (13:41 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 20 Jun 2017 07:19:12 +0000 (09:19 +0200)
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>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-mockup.c

index 536a229bde7111104d8f2be3487305fcfc731659..a6565e128f9e19ff474798d02bd9f9be78c8781b 100644 (file)
@@ -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;