Commit 68e03b85 authored Jul 31, 2019 by YueHaibing Committed by Linus Walleij Aug 14, 2019

gpio: Fix build error of function redefinition



when do randbuilding, I got this error:

In file included from drivers/hwmon/pmbus/ucd9000.c:19:0:
./include/linux/gpio/driver.h:576:1: error: redefinition of gpiochip_add_pin_range
 gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
 ^~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/hwmon/pmbus/ucd9000.c:18:0:
./include/linux/gpio.h:245:1: note: previous definition of gpiochip_add_pin_range was here
 gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
 ^~~~~~~~~~~~~~~~~~~~~~

Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: 964cb341 ("gpio: move pincontrol calls to <linux/gpio/driver.h>")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Link: https://lore.kernel.org/r/20190731123814.46624-1-yuehaibing@huawei.com


Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent 2c60e6b5

include/linux/gpio.h

+0 −24

Original line number	Diff line number	Diff line
		@@ -241,30 +241,6 @@ static inline int irq_to_gpio(unsigned irq)
		return -EINVAL;
		}

		static inline int
		gpiochip_add_pin_range(struct gpio_chip chip, const char pinctl_name,
		unsigned int gpio_offset, unsigned int pin_offset,
		unsigned int npins)
		{
		WARN_ON(1);
		return -EINVAL;
		}

		static inline int
		gpiochip_add_pingroup_range(struct gpio_chip *chip,
		struct pinctrl_dev *pctldev,
		unsigned int gpio_offset, const char *pin_group)
		{
		WARN_ON(1);
		return -EINVAL;
		}

		static inline void
		gpiochip_remove_pin_ranges(struct gpio_chip *chip)
		{
		WARN_ON(1);
		}

		static inline int devm_gpio_request(struct device *dev, unsigned gpio,
		const char *label)
		{

Admin message