Re: [PATCH] gpio: fix incorrect merge of linux/gpio/driver.h

[Brian Masney]

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@xxxxxxxx>

Reviewed-by: Brian Masney <masneyb@xxxxxxxxxxxxx>