Commit ae0755b5 authored Sep 05, 2019 by Linus Walleij

gpio: Fix up merge collision in include file

The merge of two different patch sets cleaning around in the
main driver include file collided making the function
declarations for gpiochip_[un]lock_as_irq() be defined twice
when gpiolib was unselected. Fix it up.

Cc: YueHaibing <yuehaibing@huawei.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent f0d1ab05

include/linux/gpio/driver.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -702,11 +702,12 @@ void gpiochip_free_own_desc(struct gpio_desc *desc);
		void devprop_gpiochip_set_names(struct gpio_chip *chip,
		const struct fwnode_handle *fwnode);

		#ifdef CONFIG_GPIOLIB

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

Admin message