gpio: davinci: Allocate the correct amount of memory for controller

Previously we created a controller structure per bank of GPIO pins. This
has since been changed to one per controller, but the allocation size
was not changed. Fix this here.

This also leaves the variable 'nbank' unused, instead of removing it,
move it down and use it to clean up a loop. For loops with multiple
initializers and/or iteration expressions, especially ones that don't
use those loop counters are quite hard to follow, fix this.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Tested-by: Keerthy <j-keerthy@ti.com>
Acked-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index 14d1729927d3765403e2bc64bdf07b51b874aec7..121a7948f7858a1d4586d95507eacb78ca809d0a 100644 (file)
--- a/drivers/gpio/gpio-davinci.c
+++ b/drivers/gpio/gpio-davinci.c
@@ -165,7 +165,7 @@ of_err:
 
 static int davinci_gpio_probe(struct platform_device *pdev)
 {
-       int gpio, bank, i, ret = 0;
+       int bank, i, ret = 0;
        unsigned int ngpio, nbank, nirq;
        struct davinci_gpio_controller *chips;
        struct davinci_gpio_platform_data *pdata;
@@ -204,10 +204,7 @@ static int davinci_gpio_probe(struct platform_device *pdev)
        else
                nirq = DIV_ROUND_UP(ngpio, 16);
 
-       nbank = DIV_ROUND_UP(ngpio, 32);
-       chips = devm_kcalloc(dev,
-                            nbank, sizeof(struct davinci_gpio_controller),
-                            GFP_KERNEL);
+       chips = devm_kzalloc(dev, sizeof(*chips), GFP_KERNEL);
        if (!chips)
                return -ENOMEM;
 
@@ -247,7 +244,8 @@ static int davinci_gpio_probe(struct platform_device *pdev)
 #endif
        spin_lock_init(&chips->lock);
 
-       for (gpio = 0, bank = 0; gpio < ngpio; gpio += 32, bank++)
+       nbank = DIV_ROUND_UP(ngpio, 32);
+       for (bank = 0; bank < nbank; bank++)
                chips->regs[bank] = gpio_base + offset_array[bank];
 
        ret = devm_gpiochip_add_data(dev, &chips->chip, chips);