From 64d2f4e5f94a95b23532efcbc3c955b5086bd890 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 19 Mar 2015 16:51:17 +0100 Subject: [PATCH] greybus: gpio: clean up line-state allocation Clean up allocation of line-state array. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/gpio.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c index a9153a85b011..b18fb7e12a5b 100644 --- a/drivers/staging/greybus/gpio.c +++ b/drivers/staging/greybus/gpio.c @@ -500,8 +500,6 @@ static void gb_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) static int gb_gpio_controller_setup(struct gb_gpio_controller *ggc) { - u32 line_count; - size_t size; int ret; /* First thing we need to do is check the version */ @@ -514,9 +512,8 @@ static int gb_gpio_controller_setup(struct gb_gpio_controller *ggc) if (ret) return ret; - line_count = (u32)ggc->line_max + 1; - size = line_count * sizeof(*ggc->lines); - ggc->lines = kzalloc(size, GFP_KERNEL); + ggc->lines = kcalloc(ggc->line_max + 1, sizeof(*ggc->lines), + GFP_KERNEL); if (!ggc->lines) return -ENOMEM; -- 2.39.5