| Message ID | 20201028103921.22486-1-zhe.he@windriver.com |
|---|---|
| State | Accepted |
| Commit | b507cb92477ad85902783a183c5ce01d16296687 |
| Headers | show |
| Series | pinctrl: core: Add missing #ifdef CONFIG_GPIOLIB | expand |
On Wed, Oct 28, 2020 at 12:40 PM He Zhe <zhe.he@windriver.com> wrote: > > To fix the following build warnings when CONFIG_GPIOLIB=n. > > drivers/pinctrl/core.c:1607:20: warning: unused variable 'chip' [-Wunused-variable] > 1608 | struct gpio_chip *chip; > | ^~~~ > drivers/pinctrl/core.c:1606:15: warning: unused variable 'gpio_num' [-Wunused-variable] > 1607 | unsigned int gpio_num; > | ^~~~~~~~ > drivers/pinctrl/core.c:1605:29: warning: unused variable 'range' [-Wunused-variable] > 1606 | struct pinctrl_gpio_range *range; > | ^~~~~ Makes sense. Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > Fixes: f1b206cf7c57 ("pinctrl: core: print gpio in pins debugfs file") > Signed-off-by: He Zhe <zhe.he@windriver.com> > --- > drivers/pinctrl/core.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c > index 3663d87f51a0..9fc4433fece4 100644 > --- a/drivers/pinctrl/core.c > +++ b/drivers/pinctrl/core.c > @@ -1602,9 +1602,11 @@ static int pinctrl_pins_show(struct seq_file *s, void *what) > struct pinctrl_dev *pctldev = s->private; > const struct pinctrl_ops *ops = pctldev->desc->pctlops; > unsigned i, pin; > +#ifdef CONFIG_GPIOLIB > struct pinctrl_gpio_range *range; > unsigned int gpio_num; > struct gpio_chip *chip; > +#endif > > seq_printf(s, "registered pins: %d\n", pctldev->desc->npins); > > -- > 2.17.1 >
On Wed, Oct 28, 2020 at 11:40 AM He Zhe <zhe.he@windriver.com> wrote: > To fix the following build warnings when CONFIG_GPIOLIB=n. > > drivers/pinctrl/core.c:1607:20: warning: unused variable 'chip' [-Wunused-variable] > 1608 | struct gpio_chip *chip; > | ^~~~ > drivers/pinctrl/core.c:1606:15: warning: unused variable 'gpio_num' [-Wunused-variable] > 1607 | unsigned int gpio_num; > | ^~~~~~~~ > drivers/pinctrl/core.c:1605:29: warning: unused variable 'range' [-Wunused-variable] > 1606 | struct pinctrl_gpio_range *range; > | ^~~~~ > > Fixes: f1b206cf7c57 ("pinctrl: core: print gpio in pins debugfs file") > Signed-off-by: He Zhe <zhe.he@windriver.com> Patch applied. I first applied a similar patch by Chris, but I realized it ended up mixing code and declarations so I'll go for this one instead. Yours, Linus Walleij
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 3663d87f51a0..9fc4433fece4 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -1602,9 +1602,11 @@ static int pinctrl_pins_show(struct seq_file *s, void *what) struct pinctrl_dev *pctldev = s->private; const struct pinctrl_ops *ops = pctldev->desc->pctlops; unsigned i, pin; +#ifdef CONFIG_GPIOLIB struct pinctrl_gpio_range *range; unsigned int gpio_num; struct gpio_chip *chip; +#endif seq_printf(s, "registered pins: %d\n", pctldev->desc->npins);
To fix the following build warnings when CONFIG_GPIOLIB=n. drivers/pinctrl/core.c:1607:20: warning: unused variable 'chip' [-Wunused-variable] 1608 | struct gpio_chip *chip; | ^~~~ drivers/pinctrl/core.c:1606:15: warning: unused variable 'gpio_num' [-Wunused-variable] 1607 | unsigned int gpio_num; | ^~~~~~~~ drivers/pinctrl/core.c:1605:29: warning: unused variable 'range' [-Wunused-variable] 1606 | struct pinctrl_gpio_range *range; | ^~~~~ Fixes: f1b206cf7c57 ("pinctrl: core: print gpio in pins debugfs file") Signed-off-by: He Zhe <zhe.he@windriver.com> --- drivers/pinctrl/core.c | 2 ++ 1 file changed, 2 insertions(+)