summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartosz Golaszewski <brgl@bgdev.pl>2017-06-09 13:41:32 +0200
committerLinus Walleij <linus.walleij@linaro.org>2017-06-20 09:19:12 +0200
commitf6ac438e5e9d8052b07ebe43673b88f0496fed8d (patch)
tree75640647cc58f69b39d74a57c15e8a916394780c
parentc60c7f4c6b679822da0033b3b7c077b0a36fd8e9 (diff)
downloadlinux-f6ac438e5e9d8052b07ebe43673b88f0496fed8d.tar.gz
linux-f6ac438e5e9d8052b07ebe43673b88f0496fed8d.tar.bz2
linux-f6ac438e5e9d8052b07ebe43673b88f0496fed8d.zip
gpio: mockup: use devm_kcalloc() where applicable
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>
-rw-r--r--drivers/gpio/gpio-mockup.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c
index 536a229bde71..a6565e128f9e 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;