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>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index eb75d12e83b7..623fcd9b547a 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -99,7 +99,7 @@ int gpiochip_add(struct gpio_chip *chip)
          * 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;
         }
@@ -174,7 +174,7 @@ int gpio_request(unsigned gpio, const char *label)
 
         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)
@@ -209,7 +209,7 @@ void gpio_free(unsigned gpio)
         unsigned long           flags;
         struct gpio_desc        *desc;
 
-        if (gpio >= ARCH_NR_GPIOS) {
+        if (!gpio_is_valid(gpio)) {
                 WARN_ON(extra_checks);
                 return;
         }
@@ -245,7 +245,7 @@ const char *gpiochip_is_requested(struct gpio_chip *chip, unsigned offset)
 {
         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;
@@ -276,7 +276,7 @@ int gpio_direction_input(unsigned gpio)
 
         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)
@@ -314,7 +314,7 @@ int gpio_direction_output(unsigned gpio, int value)
 
         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)
@@ -531,7 +531,7 @@ static int gpiolib_show(struct seq_file *s, void *unused)
 
         /* 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;