Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48207d75 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Linus Walleij
Browse files

gpio: drop devm_gpiochip_remove() 



There is hardly any reason to call devm_gpiochip_remove() because the
driver core handles calling gpiochip_remove() automatically.

To make it harder to introduce new (and probably unneeded) callers, drop
the function.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 25451945

Documentation/driver-model/devres.txt

+0 −1
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ GPIO 
  devm_gpiod_get_optional()

  devm_gpiod_put()

  devm_gpiochip_add_data()

  devm_gpiochip_remove()

  devm_gpio_request()

  devm_gpio_request_one()

  devm_gpio_free()

drivers/gpio/gpiolib.c

+1 −17
Original line number Diff line number Diff line
@@ -1524,6 +1524,7 @@ static int devm_gpio_chip_match(struct device *dev, void *res, void *data) 
	return *r == data;

}





/**

 * devm_gpiochip_add_data() - Resource manager gpiochip_add_data()

 * @dev: pointer to the device that gpio_chip belongs to.
@@ -1563,23 +1564,6 @@ int devm_gpiochip_add_data(struct device *dev, struct gpio_chip *chip, 
}

EXPORT_SYMBOL_GPL(devm_gpiochip_add_data);



/**

 * devm_gpiochip_remove() - Resource manager of gpiochip_remove()

 * @dev: device for which which resource was allocated

 * @chip: the chip to remove

 *

 * A gpio_chip with any GPIOs still requested may not be removed.

 */

void devm_gpiochip_remove(struct device *dev, struct gpio_chip *chip)

{

	int ret;



	ret = devres_release(dev, devm_gpio_chip_release,

			     devm_gpio_chip_match, chip);

	WARN_ON(ret);

}

EXPORT_SYMBOL_GPL(devm_gpiochip_remove);



/**

 * gpiochip_find() - iterator for locating a specific gpio_chip

 * @data: data to pass to match function

include/linux/gpio/driver.h

+0 −1
Original line number Diff line number Diff line
@@ -422,7 +422,6 @@ static inline int gpiochip_add(struct gpio_chip *chip) 
extern void gpiochip_remove(struct gpio_chip *chip);

extern int devm_gpiochip_add_data(struct device *dev, struct gpio_chip *chip,

				  void *data);

extern void devm_gpiochip_remove(struct device *dev, struct gpio_chip *chip);



extern struct gpio_chip *gpiochip_find(void *data,

			      int (*match)(struct gpio_chip *chip, void *data));