2008-07-21 20:08:14 +03:00
|
|
|
From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
|
|
|
|
Date: Mon, 28 Apr 2008 09:14:46 +0000 (-0700)
|
|
|
|
Subject: gpio: define gpio_is_valid()
|
|
|
|
X-Git-Tag: v2.6.26-rc1~849
|
|
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e6de1808f8ebfeb7e49f3c5a30cb8f2032beb287
|
|
|
|
|
|
|
|
gpio: define gpio_is_valid()
|
|
|
|
|
|
|
|
Introduce a gpio_is_valid() predicate; use it in gpiolib.
|
|
|
|
|
|
|
|
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
|
|
|
|
[ use inline function; follow the gpio_* naming convention;
|
|
|
|
work without gpiolib; all programming interfaces need docs ]
|
|
|
|
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
|
|
|
|
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|
|
|
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
|
|
|
---
|
|
|
|
|
|
|
|
--- a/Documentation/gpio.txt
|
|
|
|
+++ b/Documentation/gpio.txt
|
2008-11-07 10:44:56 +02:00
|
|
|
@@ -107,6 +107,16 @@ type of GPIO controller, and on one part
|
2008-07-21 20:08:14 +03:00
|
|
|
The numbers need not be contiguous; either of those platforms could also
|
|
|
|
use numbers 2000-2063 to identify GPIOs in a bank of I2C GPIO expanders.
|
|
|
|
|
|
|
|
+If you want to initialize a structure with an invalid GPIO number, use
|
|
|
|
+some negative number (perhaps "-EINVAL"); that will never be valid. To
|
|
|
|
+test if a number could reference a GPIO, you may use this predicate:
|
|
|
|
+
|
|
|
|
+ int gpio_is_valid(int number);
|
|
|
|
+
|
|
|
|
+A number that's not valid will be rejected by calls which may request
|
|
|
|
+or free GPIOs (see below). Other numbers may also be rejected; for
|
|
|
|
+example, a number might be valid but unused on a given board.
|
|
|
|
+
|
|
|
|
Whether a platform supports multiple GPIO controllers is currently a
|
|
|
|
platform-specific implementation issue.
|
|
|
|
|
|
|
|
--- a/drivers/gpio/gpiolib.c
|
|
|
|
+++ b/drivers/gpio/gpiolib.c
|
2008-11-07 10:44:56 +02:00
|
|
|
@@ -99,7 +99,7 @@ int gpiochip_add(struct gpio_chip *chip)
|
2008-07-21 20:08:14 +03:00
|
|
|
* dynamic allocation. We don't currently support that.
|
|
|
|
*/
|
|
|
|
|
|
|
|
- if (chip->base < 0 || (chip->base + chip->ngpio) >= ARCH_NR_GPIOS) {
|
|
|
|
+ if (chip->base < 0 || !gpio_is_valid(chip->base + chip->ngpio)) {
|
|
|
|
status = -EINVAL;
|
|
|
|
goto fail;
|
|
|
|
}
|
2008-11-07 10:44:56 +02:00
|
|
|
@@ -174,7 +174,7 @@ int gpio_request(unsigned gpio, const ch
|
2008-07-21 20:08:14 +03:00
|
|
|
|
|
|
|
spin_lock_irqsave(&gpio_lock, flags);
|
|
|
|
|
|
|
|
- if (gpio >= ARCH_NR_GPIOS)
|
|
|
|
+ if (!gpio_is_valid(gpio))
|
|
|
|
goto done;
|
|
|
|
desc = &gpio_desc[gpio];
|
|
|
|
if (desc->chip == NULL)
|
2008-11-07 10:44:56 +02:00
|
|
|
@@ -209,7 +209,7 @@ void gpio_free(unsigned gpio)
|
2008-07-21 20:08:14 +03:00
|
|
|
unsigned long flags;
|
|
|
|
struct gpio_desc *desc;
|
|
|
|
|
|
|
|
- if (gpio >= ARCH_NR_GPIOS) {
|
|
|
|
+ if (!gpio_is_valid(gpio)) {
|
|
|
|
WARN_ON(extra_checks);
|
|
|
|
return;
|
|
|
|
}
|
2008-11-07 10:44:56 +02:00
|
|
|
@@ -245,7 +245,7 @@ const char *gpiochip_is_requested(struct
|
2008-07-21 20:08:14 +03:00
|
|
|
{
|
|
|
|
unsigned gpio = chip->base + offset;
|
|
|
|
|
|
|
|
- if (gpio >= ARCH_NR_GPIOS || gpio_desc[gpio].chip != chip)
|
|
|
|
+ if (!gpio_is_valid(gpio) || gpio_desc[gpio].chip != chip)
|
|
|
|
return NULL;
|
|
|
|
if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0)
|
|
|
|
return NULL;
|
2008-11-07 10:44:56 +02:00
|
|
|
@@ -276,7 +276,7 @@ int gpio_direction_input(unsigned gpio)
|
2008-07-21 20:08:14 +03:00
|
|
|
|
|
|
|
spin_lock_irqsave(&gpio_lock, flags);
|
|
|
|
|
|
|
|
- if (gpio >= ARCH_NR_GPIOS)
|
|
|
|
+ if (!gpio_is_valid(gpio))
|
|
|
|
goto fail;
|
|
|
|
chip = desc->chip;
|
|
|
|
if (!chip || !chip->get || !chip->direction_input)
|
2008-11-07 10:44:56 +02:00
|
|
|
@@ -314,7 +314,7 @@ int gpio_direction_output(unsigned gpio,
|
2008-07-21 20:08:14 +03:00
|
|
|
|
|
|
|
spin_lock_irqsave(&gpio_lock, flags);
|
|
|
|
|
|
|
|
- if (gpio >= ARCH_NR_GPIOS)
|
|
|
|
+ if (!gpio_is_valid(gpio))
|
|
|
|
goto fail;
|
|
|
|
chip = desc->chip;
|
|
|
|
if (!chip || !chip->set || !chip->direction_output)
|
2008-11-07 10:44:56 +02:00
|
|
|
@@ -531,7 +531,7 @@ static int gpiolib_show(struct seq_file
|
2008-07-21 20:08:14 +03:00
|
|
|
|
|
|
|
/* REVISIT this isn't locked against gpio_chip removal ... */
|
|
|
|
|
|
|
|
- for (gpio = 0; gpio < ARCH_NR_GPIOS; gpio++) {
|
|
|
|
+ for (gpio = 0; gpio_is_valid(gpio); gpio++) {
|
|
|
|
if (chip == gpio_desc[gpio].chip)
|
|
|
|
continue;
|
|
|
|
chip = gpio_desc[gpio].chip;
|
|
|
|
--- a/include/asm-generic/gpio.h
|
|
|
|
+++ b/include/asm-generic/gpio.h
|
|
|
|
@@ -16,6 +16,12 @@
|
|
|
|
#define ARCH_NR_GPIOS 256
|
|
|
|
#endif
|
|
|
|
|
|
|
|
+static inline int gpio_is_valid(int number)
|
|
|
|
+{
|
|
|
|
+ /* only some non-negative numbers are valid */
|
|
|
|
+ return ((unsigned)number) < ARCH_NR_GPIOS;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
struct seq_file;
|
|
|
|
struct module;
|
|
|
|
|
2008-11-07 10:44:56 +02:00
|
|
|
@@ -99,6 +105,16 @@ extern int __gpio_cansleep(unsigned gpio
|
2008-07-21 20:08:14 +03:00
|
|
|
|
|
|
|
#else
|
|
|
|
|
2008-07-22 14:22:41 +03:00
|
|
|
+static inline int __gpio_is_valid(int number)
|
2008-07-21 20:08:14 +03:00
|
|
|
+{
|
|
|
|
+ /* only non-negative numbers are valid */
|
|
|
|
+ return number >= 0;
|
|
|
|
+}
|
2008-07-22 14:22:41 +03:00
|
|
|
+
|
|
|
|
+#ifndef gpio_is_valid
|
|
|
|
+#define gpio_is_valid __gpio_is_valid
|
|
|
|
+#endif
|
2008-07-21 20:08:14 +03:00
|
|
|
+
|
|
|
|
/* platforms that don't directly support access to GPIOs through I2C, SPI,
|
|
|
|
* or other blocking infrastructure can use these wrappers.
|
|
|
|
*/
|