gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h (c7663fa2) · Commits · 戴 / test

If CONFIG_GPIOLIB is not, gpiochip_lock/unlock_as_irq will conflict as this: In file included from sound/soc/codecs/wm5100.c:18:0: ./include/linux/gpio.h:224:19: error: static declaration of gpiochip_lock_as_irq follows non-static declaration static inline int gpiochip_lock_as_irq(struct gpio_chip *chip, ^~~~~~~~~~~~~~~~~~~~ In file included from sound/soc/codecs/wm5100.c:17:0: ./include/linux/gpio/driver.h:494:5: note: previous declaration of gpiochip_lock_as_irq was here int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset); ^~~~~~~~~~~~~~~~~~~~ In file included from sound/soc/codecs/wm5100.c:18:0: ./include/linux/gpio.h:231:20: error: static declaration of gpiochip_unlock_as_irq follows non-static declaration static inline void gpiochip_unlock_as_irq(struct gpio_chip *chip, ^~~~~~~~~~~~~~~~~~~~~~ In file included from sound/soc/codecs/wm5100.c:17:0: ./include/linux/gpio/driver.h:495:6: note: previous declaration of gpiochip_unlock_as_irq was here void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset); ^~~~~~~~~~~~~~~~~~~~~~ Move them to gpio/driver.h and use CONFIG_GPIOLIB guard this. Reported-by:

Hulk Robot <hulkci@huawei.com> Fixes: ("gpio: remove gpiod_lock/unlock_as_irq()") Signed-off-by:

YueHaibing <yuehaibing@huawei.com> Link: https://lore.kernel.org/r/20190822031817.32888-1-yuehaibing@huawei.com Signed-off-by:

Linus Walleij <linus.walleij@linaro.org>

include/linux/gpio.h

+0 −13

Original line number	Diff line number	Diff line
		@@ -221,19 +221,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() */

include/linux/gpio/driver.h

+16 −3

Original line number	Diff line number	Diff line
		@@ -495,9 +495,6 @@ extern int devm_gpiochip_add_data(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);
		bool gpiochip_line_is_irq(struct gpio_chip *chip, unsigned int offset);
		int gpiochip_reqres_irq(struct gpio_chip *chip, unsigned int offset);
		void gpiochip_relres_irq(struct gpio_chip *chip, unsigned int offset);
		@@ -723,6 +720,10 @@ void gpiochip_free_own_desc(struct gpio_desc *desc);
		void devprop_gpiochip_set_names(struct gpio_chip *chip,
		const struct fwnode_handle *fwnode);

		/* 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);

		#else /* CONFIG_GPIOLIB */

		static inline struct gpio_chip gpiod_to_chip(const struct gpio_desc desc)
		@@ -732,6 +733,18 @@ static inline struct gpio_chip gpiod_to_chip(const struct gpio_desc desc)
		return ERR_PTR(-ENODEV);
		}

		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);
		}
		#endif /* CONFIG_GPIOLIB */

		#endif

Admin message