From: Alexandre Courbot <acourbot@nvidia.com>
To: Grant Likely <grant.likely@secretlab.ca>,
Linus Walleij <linus.walleij@linaro.org>,
Arnd Bergmann <arnd@arndb.de>
Cc: linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, gnurou@gmail.com,
Alexandre Courbot <acourbot@nvidia.com>
Subject: [PATCH 9/9] gpiolib: dynamically allocate descriptors array
Date: Sun, 3 Feb 2013 01:29:32 +0900 [thread overview]
Message-ID: <1359822572-26009-11-git-send-email-acourbot@nvidia.com> (raw)
In-Reply-To: <1359822572-26009-1-git-send-email-acourbot@nvidia.com>
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 <acourbot@nvidia.com>
---
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
next prev parent reply other threads:[~2013-02-02 16:29 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-02 16:29 [PATCH 0/9] gpiolib: remove gpio_desc[] static array Alexandre Courbot
2013-02-02 16:29 ` Alexandre Courbot
2013-02-02 16:29 ` [PATCH 1/9] gpiolib: link all gpio_chips using a list Alexandre Courbot
2013-02-02 16:29 ` Alexandre Courbot
2013-02-05 17:00 ` Linus Walleij
2013-02-09 9:20 ` Grant Likely
2013-02-09 9:20 ` Grant Likely
2013-02-02 16:29 ` [PATCH 2/9] gpiolib: use gpio_chips list in gpiolib_sysfs_init Alexandre Courbot
2013-02-02 16:29 ` Alexandre Courbot
2013-02-05 17:04 ` Linus Walleij
2013-02-09 9:22 ` Grant Likely
2013-02-09 9:22 ` Grant Likely
2013-02-02 16:29 ` [PATCH 3/9] gpiolib: use gpio_chips list in gpiochip_find Alexandre Courbot
2013-02-02 16:29 ` Alexandre Courbot
2013-02-05 17:05 ` Linus Walleij
2013-02-09 9:25 ` Grant Likely
2013-02-09 9:25 ` Grant Likely
2013-02-02 16:29 ` [PATCH 4/9] gpiolib: use gpio_chips list in sysfs ops Alexandre Courbot
2013-02-02 16:29 ` Alexandre Courbot
2013-02-05 17:15 ` Linus Walleij
2013-02-05 17:15 ` Linus Walleij
2013-02-09 9:37 ` Grant Likely
2013-02-09 9:37 ` Grant Likely
2013-02-09 13:53 ` Alexandre Courbot
2013-02-02 16:29 ` [PATCH 5/9] gpiolib: use gpio_chips list in gpiochip_find_base Alexandre Courbot
2013-02-02 16:29 ` Alexandre Courbot
2013-02-05 17:21 ` Linus Walleij
2013-02-06 4:48 ` Alex Courbot
2013-02-09 9:47 ` Grant Likely
2013-02-09 9:47 ` Grant Likely
2013-02-02 16:29 ` [PATCH 6/9] gpiolib: use descriptors internally Alexandre Courbot
2013-02-02 16:29 ` Alexandre Courbot
2013-02-05 17:53 ` Linus Walleij
2013-02-07 6:57 ` Alexandre Courbot
2013-02-09 9:17 ` Grant Likely
2013-02-09 9:17 ` Grant Likely
2013-02-11 14:09 ` Linus Walleij
2013-02-11 15:40 ` Paul Mundt
2013-02-11 15:40 ` Paul Mundt
2013-02-11 17:39 ` Stephen Warren
2013-02-12 12:29 ` Linus Walleij
2013-02-12 15:59 ` Paul Mundt
2013-02-12 17:18 ` Arnd Bergmann
2013-02-09 13:11 ` Grant Likely
2013-02-09 13:11 ` Grant Likely
2013-02-09 14:15 ` Alexandre Courbot
2013-02-09 13:24 ` Grant Likely
2013-02-09 13:24 ` Grant Likely
2013-02-09 14:18 ` Alexandre Courbot
2013-02-02 16:29 ` [PATCH 7/9] gpiolib: let gpio_chip reference its descriptors Alexandre Courbot
2013-02-05 18:00 ` Linus Walleij
2013-02-09 13:28 ` Grant Likely
2013-02-02 16:29 ` [PATCH 8/9] gpiolib: use gpio_chips list in gpio_to_desc Alexandre Courbot
2013-02-05 18:01 ` Linus Walleij
2013-02-05 18:01 ` Linus Walleij
2013-02-09 9:58 ` Grant Likely
2013-02-09 9:58 ` Grant Likely
2013-02-09 14:21 ` Alexandre Courbot
2013-02-09 14:21 ` Alexandre Courbot
2013-02-09 14:37 ` Grant Likely
2013-02-02 16:29 ` Alexandre Courbot [this message]
2013-02-02 16:29 ` [PATCH 9/9] gpiolib: dynamically allocate descriptors array Alexandre Courbot
2013-02-05 18:02 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359822572-26009-11-git-send-email-acourbot@nvidia.com \
--to=acourbot@nvidia.com \
--cc=arnd@arndb.de \
--cc=gnurou@gmail.com \
--cc=grant.likely@secretlab.ca \
--cc=linus.walleij@linaro.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).