gpio: fix incorrect merge of linux/gpio/driver.h
diff mbox series

Message ID 20190909203512.675822-1-arnd@arndb.de
State New
Headers show
Series
  • gpio: fix incorrect merge of linux/gpio/driver.h
Related show

Commit Message

Arnd Bergmann Sept. 9, 2019, 8:34 p.m. UTC
Two otherwise correct patches got merged incorrectly, which leads to
build problems when CONFIG_GPIOLIB is disabled:

include/linux/gpio/driver.h:722:19: error: static declaration of 'gpiochip_lock_as_irq' follows non-static declaration
static inline int gpiochip_lock_as_irq(struct gpio_chip *chip,
                  ^
include/linux/gpio/driver.h:706:5: note: previous declaration is here
int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset);
    ^
include/linux/gpio/driver.h:729:20: error: static declaration of 'gpiochip_unlock_as_irq' follows non-static declaration
static inline void gpiochip_unlock_as_irq(struct gpio_chip *chip,
                   ^
include/linux/gpio/driver.h:707:6: note: previous declaration is here
void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset);

Fixes: 8a6abcd04e4c ("Merge tag 'gpio-v5.4-updates-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel")
Fixes: 9091373ab7ea ("gpio: remove less important #ifdef around declarations")
Fixes: c7663fa2a663 ("gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 include/linux/gpio/driver.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Brian Masney Sept. 9, 2019, 11 p.m. UTC | #1
On Mon, Sep 09, 2019 at 10:34:59PM +0200, Arnd Bergmann wrote:
> Two otherwise correct patches got merged incorrectly, which leads to
> build problems when CONFIG_GPIOLIB is disabled:
> 
> include/linux/gpio/driver.h:722:19: error: static declaration of 'gpiochip_lock_as_irq' follows non-static declaration
> static inline int gpiochip_lock_as_irq(struct gpio_chip *chip,
>                   ^
> include/linux/gpio/driver.h:706:5: note: previous declaration is here
> int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset);
>     ^
> include/linux/gpio/driver.h:729:20: error: static declaration of 'gpiochip_unlock_as_irq' follows non-static declaration
> static inline void gpiochip_unlock_as_irq(struct gpio_chip *chip,
>                    ^
> include/linux/gpio/driver.h:707:6: note: previous declaration is here
> void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset);
> 
> Fixes: 8a6abcd04e4c ("Merge tag 'gpio-v5.4-updates-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel")
> Fixes: 9091373ab7ea ("gpio: remove less important #ifdef around declarations")
> Fixes: c7663fa2a663 ("gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Brian Masney <masneyb@onstation.org>
Linus Walleij Sept. 10, 2019, 10:16 a.m. UTC | #2
On Mon, Sep 9, 2019 at 9:35 PM Arnd Bergmann <arnd@arndb.de> wrote:

> Two otherwise correct patches got merged incorrectly, which leads to
> build problems when CONFIG_GPIOLIB is disabled:

This has actually been fixed in my for-next branch for days,
the problem is that new next releases are not coming out
currently because of kernel summit, so the fix is not turning
up in next.

I have gotten something like 4 different fixes for this at this
point :D

Yours,
Linus Walleij

Patch
diff mbox series

diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index b74a3bee85e5..fb134ff20f6b 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -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)