gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h
PATCH 1/1 gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h
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.
--- include/linux/gpio.h | 13 ------------- include/linux/gpio/driver.h | 19 ++++++++++++++++--- 2 files changed, 16 insertions(+), 16 deletions(-)
include/linux/gpio.h +0 -13
@@ -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
@@ -490,9 +490,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);
@@ -710,6 +707,10 @@ void devprop_gpiochip_set_names(struct gpio_chip *chip,struct gpio_chip *gpiod_to_chip (const struct gpio_desc *desc); +/* 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)
@@ -719,6 +720,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 /* __LINUX_GPIO_DRIVER_H */
Signature · 1 line
2.7.4
Quoted 20 lines · YueHaibing
If
CONFIG_GPIOLIBis 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 ofgpiochip_lock_as_irqfollows non-static declaration
static inline int gpiochip_lock_as_irq(structgpio_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); ^~~~~~~~~~~~~~~~~~~~~~
Quoted 5 lines
Move them to
gpio/driver.hand useCONFIG_GPIOLIBguard this.Reported-by Hulk Robot <[email protected]>Fixes d74be6dfea1b ("gpio: remove gpiod_lock/unlock_as_irq()")Signed-off-by YueHaibing <[email protected]>
Patch applied with some fuzzing.
Yours,
Linus Walleij
PATCH 1/1 gpio: Move gpiochip_.*lock_as_irq() to the proper ifdef
In a recent commit the gpiochip_.*lock_as_irq() were moved and ended up in the wrong `ifdef' section. Now for !CONFIG_GPIOLIB the function is defined twice leading to an compile error.
Move the extern function declaration under CONFIG_GPIOLIB, the "static inline" version is already under !CONFIG_GPIOLIB.
--- include/linux/gpio/driver.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/linux/gpio/driver.h +4 -4
@@ -702,14 +702,14 @@ 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); -#ifdef CONFIG_GPIOLIB struct gpio_chip *gpiod_to_chip (const struct gpio_desc *desc); +/* 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)
Signature · 1 line
2.23.0
Re: [PATCH] gpio: Move gpiochip_.*lock_as_irq() to the proper ifdef
Quoted 24 lines · Sebastian Andrzej Siewior
In a recent commit the gpiochip_.*lock_as_irq() were moved and ended up in the wrong `ifdef' section. Now for !CONFIG_GPIOLIB the function is defined twice leading to an compile error.
Move the extern function declaration under
CONFIG_GPIOLIB, the "static inline" version is already under !CONFIG_GPIOLIB.Fixes c7663fa2a6631 ("gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h")Signed-off-by Sebastian Andrzej Siewior <[email protected]>--- include/linux/gpio/driver.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)include/linux/gpio/driver.h +0
-3@@ -702,14 +702,14 @@ 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);
include/linux/gpio/driver.h void gpiochip_free_own_desc(struct gpio_desc *desc); · line 713
Quoted 10 lines
include/linux/gpio/driver.h +4
-1-#ifdef CONFIG_GPIOLIB struct gpio_chip *gpiod_to_chip (const struct gpio_desc *desc); +/* 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 */
Interesting, my patch indeed do the correct thing:
+/* 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 */
however, now in include/linux/gpio/driver.h, it is:
/* 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);
#ifdef CONFIG_GPIOLIB
struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc);
#else /* CONFIG_GPIOLIB */
Maybe this caused by the fuzzing? Anyway, this fix the issue, so
Quoted 3 lines
include/linux/gpio/driver.h +0
-0static inline struct gpio_chip *gpiod_to_chip (const struct gpio_desc *desc)
Re: [PATCH] gpio: Move gpiochip_.*lock_as_irq() to the proper ifdef
I aldready fixed this up in my tree.
Quoted 1 line · Yuehaibing
Interesting, my patch indeed do the correct thing:
It is a classic merge collision. Something fun for the subsystem maintainer to deal with :D
Yours,
Linus Walleij