Message ID | 20190731100028.48884-1-yuehaibing@huawei.com |
---|---|
State | New |
Headers | show |
Series |
|
Related | show |
Pls drop this On 2019/7/31 18:00, YueHaibing wrote: > when building without CONFIG_PINCTRL: > > 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: 964cb341882f ("gpio: move pincontrol calls to <linux/gpio/driver.h>") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > include/linux/gpio/driver.h | 35 +---------------------------------- > 1 file changed, 1 insertion(+), 34 deletions(-) > > diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h > index f28f534..09f96ec 100644 > --- a/include/linux/gpio/driver.h > +++ b/include/linux/gpio/driver.h > @@ -10,6 +10,7 @@ > #include <linux/lockdep.h> > #include <linux/pinctrl/pinctrl.h> > #include <linux/pinctrl/pinconf-generic.h> > +#include <linux/gpio.h> > > struct gpio_desc; > struct of_phandle_args; > @@ -560,40 +561,6 @@ struct gpio_pin_range { > struct pinctrl_gpio_range range; > }; > > -#ifdef CONFIG_PINCTRL > - > -int gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name, > - unsigned int gpio_offset, unsigned int pin_offset, > - unsigned int npins); > -int gpiochip_add_pingroup_range(struct gpio_chip *chip, > - struct pinctrl_dev *pctldev, > - unsigned int gpio_offset, const char *pin_group); > -void gpiochip_remove_pin_ranges(struct gpio_chip *chip); > - > -#else /* ! CONFIG_PINCTRL */ > - > -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) > -{ > - return 0; > -} > -static inline int > -gpiochip_add_pingroup_range(struct gpio_chip *chip, > - struct pinctrl_dev *pctldev, > - unsigned int gpio_offset, const char *pin_group) > -{ > - return 0; > -} > - > -static inline void > -gpiochip_remove_pin_ranges(struct gpio_chip *chip) > -{ > -} > - > -#endif /* CONFIG_PINCTRL */ > - > struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *chip, u16 hwnum, > const char *label, > enum gpio_lookup_flags lflags, >
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index f28f534..09f96ec 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -10,6 +10,7 @@ #include <linux/lockdep.h> #include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinconf-generic.h> +#include <linux/gpio.h> struct gpio_desc; struct of_phandle_args; @@ -560,40 +561,6 @@ struct gpio_pin_range { struct pinctrl_gpio_range range; }; -#ifdef CONFIG_PINCTRL - -int gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name, - unsigned int gpio_offset, unsigned int pin_offset, - unsigned int npins); -int gpiochip_add_pingroup_range(struct gpio_chip *chip, - struct pinctrl_dev *pctldev, - unsigned int gpio_offset, const char *pin_group); -void gpiochip_remove_pin_ranges(struct gpio_chip *chip); - -#else /* ! CONFIG_PINCTRL */ - -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) -{ - return 0; -} -static inline int -gpiochip_add_pingroup_range(struct gpio_chip *chip, - struct pinctrl_dev *pctldev, - unsigned int gpio_offset, const char *pin_group) -{ - return 0; -} - -static inline void -gpiochip_remove_pin_ranges(struct gpio_chip *chip) -{ -} - -#endif /* CONFIG_PINCTRL */ - struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *chip, u16 hwnum, const char *label, enum gpio_lookup_flags lflags,
when building without CONFIG_PINCTRL: 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: 964cb341882f ("gpio: move pincontrol calls to <linux/gpio/driver.h>") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- include/linux/gpio/driver.h | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-)