renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 06:04:14 +08:00
Code

gpio: gpiolib: set gpiochip_remove retval to void

Browse Source 
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>
This commit is contained in:
abdoulaye berthe 2014-07-05 18:28:50 +02:00 committed by Linus Walleij
parent e27e278608
commit e1db1706c8
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpio/gpiolib.c
View File

@ -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. * 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; unsigned long flags;
int status = 0;
unsigned id; unsigned id;
acpi_gpiochip_remove(chip); acpi_gpiochip_remove(chip);
@ -323,24 +322,15 @@ int gpiochip_remove(struct gpio_chip *chip)
of_gpiochip_remove(chip); of_gpiochip_remove(chip);
for (id = 0; id < chip->ngpio; id++) { for (id = 0; id < chip->ngpio; id++) {
if (test_bit(FLAG_REQUESTED, &chip->desc[id].flags)) { if (test_bit(FLAG_REQUESTED, &chip->desc[id].flags))
status = -EBUSY; dev_crit(chip->dev, "REMOVING GPIOCHIP WITH GPIOS STILL REQUESTED\n");
break;
} }
}
if (status == 0) {
for (id = 0; id < chip->ngpio; id++) for (id = 0; id < chip->ngpio; id++)
chip->desc[id].chip = NULL; chip->desc[id].chip = NULL;
list_del(&chip->list); list_del(&chip->list);
}
spin_unlock_irqrestore(&gpio_lock, flags); spin_unlock_irqrestore(&gpio_lock, flags);
if (status == 0)
gpiochip_unexport(chip); gpiochip_unexport(chip);
return status;
} }
EXPORT_SYMBOL_GPL(gpiochip_remove); EXPORT_SYMBOL_GPL(gpiochip_remove);

2
include/linux/gpio/driver.h
View File

@ -141,7 +141,7 @@ extern const char *gpiochip_is_requested(struct gpio_chip *chip,
/* add/remove chips */ /* add/remove chips */
extern int gpiochip_add(struct gpio_chip *chip); 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, extern struct gpio_chip *gpiochip_find(void *data,
int (*match)(struct gpio_chip *chip, void *data)); int (*match)(struct gpio_chip *chip, void *data));