gpio: gpiolib: set gpiochip_remove retval to void

This avoids handling gpiochip remove error in device
remove handler.

Signed-off-by: Abdoulaye Berthe <berthe.ab@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

2 files changed, 8 insertions, 18 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index a5831d6a9b91..bf1bb795f100 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -308,10 +308,9 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip);
  *
  * A gpio_chip with any GPIOs still requested may not be removed.
  */
-int gpiochip_remove(struct gpio_chip *chip)
+void gpiochip_remove(struct gpio_chip *chip)
 {
         unsigned long   flags;
-        int             status = 0;
         unsigned        id;
 
         acpi_gpiochip_remove(chip);
@@ -323,24 +322,15 @@ int gpiochip_remove(struct gpio_chip *chip)
         of_gpiochip_remove(chip);
 
         for (id = 0; id < chip->ngpio; id++) {
-                if (test_bit(FLAG_REQUESTED, &chip->desc[id].flags)) {
-                        status = -EBUSY;
-                        break;
-                }
-        }
-        if (status == 0) {
-                for (id = 0; id < chip->ngpio; id++)
-                        chip->desc[id].chip = NULL;
-
-                list_del(&chip->list);
+                if (test_bit(FLAG_REQUESTED, &chip->desc[id].flags))
+                        dev_crit(chip->dev, "REMOVING GPIOCHIP WITH GPIOS STILL REQUESTED\n");
         }
+        for (id = 0; id < chip->ngpio; id++)
+                chip->desc[id].chip = NULL;
 
+        list_del(&chip->list);
         spin_unlock_irqrestore(&gpio_lock, flags);
-
-        if (status == 0)
-                gpiochip_unexport(chip);
-
-        return status;
+        gpiochip_unexport(chip);
 }
 EXPORT_SYMBOL_GPL(gpiochip_remove);
 
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index a2de58fffd19..560bf7fa614f 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -141,7 +141,7 @@ extern const char *gpiochip_is_requested(struct gpio_chip *chip,
 
 /* add/remove chips */
 extern int gpiochip_add(struct gpio_chip *chip);
-extern int gpiochip_remove(struct gpio_chip *chip);
+extern void gpiochip_remove(struct gpio_chip *chip);
 extern struct gpio_chip *gpiochip_find(void *data,
                               int (*match)(struct gpio_chip *chip, void *data));