From: Hans Verkuil <hans.verkuil@xxxxxxxxx> Now that these functions are no longer called we can remove them from gpiolib. Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx> --- drivers/gpio/gpiolib.c | 15 --------------- include/linux/gpio.h | 13 ------------- include/linux/gpio/driver.h | 4 +--- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 0efa9ec4fec4..b48857ade55c 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -3391,21 +3391,6 @@ static void gpiochip_irq_unlock(struct gpio_chip *chip, unsigned int offset) desc_set_label(desc, NULL); } -/* - * Keep these two temporary stubs until all drivers stop calling these - * functions. - */ -int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset) -{ - return 0; -} -EXPORT_SYMBOL_GPL(gpiochip_lock_as_irq); - -void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset) -{ -} -EXPORT_SYMBOL_GPL(gpiochip_unlock_as_irq); - bool gpiochip_line_is_irq(struct gpio_chip *chip, unsigned int offset) { if (offset >= chip->ngpio) diff --git a/include/linux/gpio.h b/include/linux/gpio.h index 39745b8bdd65..4c8e984db29c 100644 --- a/include/linux/gpio.h +++ b/include/linux/gpio.h @@ -220,19 +220,6 @@ static inline int gpio_to_irq(unsigned gpio) return -EINVAL; } -static inline int gpiochip_lock_as_irq(struct gpio_chip *chip, - unsigned int offset) -{ - WARN_ON(1); - return -EINVAL; -} - -static inline void gpiochip_unlock_as_irq(struct gpio_chip *chip, - unsigned int offset) -{ - WARN_ON(1); -} - static inline int irq_to_gpio(unsigned irq) { /* irq can never have been returned from gpio_to_irq() */ diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index 0485bd339178..70367b056062 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -398,9 +398,7 @@ 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)); -/* lock/unlock as IRQ */ -int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset); -void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset); +/* line is configure as IRQ */ bool gpiochip_line_is_irq(struct gpio_chip *chip, unsigned int offset); /* Line status inquiry for drivers */ -- 2.18.0