Allocate the GPIO descriptor's memory dynamically when GPIO chips are added instead of using the static gpio_desc[] array. gpio_desc[] is now totally unused and therefore removed.
Signed-off-by: Alexandre Courbot <[email protected]> --- drivers/gpio/gpiolib.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 0247c48..893cf94 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -41,7 +41,7 @@ #define extra_checks 0 #endif -/* gpio_lock prevents conflicts during gpio_desc[] table updates. +/* gpio_lock prevents conflicts during gpio descriptors updates. * While any GPIO is requested, its gpio_chip is not removable; * each GPIO's "requested" flag serves as a lock and refcount. */ @@ -70,7 +70,6 @@ struct gpio_desc { const char *label; #endif }; -static struct gpio_desc gpio_desc[ARCH_NR_GPIOS]; #define GPIO_OFFSET_VALID(chip, offset) (offset >= 0 && offset < chip->ngpio) @@ -1163,6 +1162,13 @@ int gpiochip_add(struct gpio_chip *chip) goto fail; } + chip->desc = kzalloc(sizeof(struct gpio_desc) * chip->ngpio, + GFP_KERNEL); + if (!chip->desc) { + status = -ENOMEM; + goto fail; + } + spin_lock_irqsave(&gpio_lock, flags); if (base < 0) { @@ -1177,8 +1183,6 @@ int gpiochip_add(struct gpio_chip *chip) status = gpiochip_add_to_list(chip); if (status == 0) { - chip->desc = &gpio_desc[chip->base]; - for (id = 0; id < chip->ngpio; id++) { struct gpio_desc *desc = &chip->desc[id]; desc->chip = chip; @@ -1218,6 +1222,8 @@ unlock: return 0; fail: + kfree(chip->desc); + /* failures here can mean systems won't boot... */ pr_err("gpiochip_add: gpios %d..%d (%s) failed to register\n", chip->base, chip->base + chip->ngpio - 1, @@ -1261,6 +1267,8 @@ int gpiochip_remove(struct gpio_chip *chip) if (status == 0) gpiochip_unexport(chip); + kfree(chip->desc); + return status; } EXPORT_SYMBOL_GPL(gpiochip_remove); -- 1.8.1.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
