2020-10-29 07:30:16

by He Zhe

Subject: [PATCH] pinctrl: core: Add missing #ifdef CONFIG_GPIOLIB

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 <[email protected]>
---
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

2020-10-29 08:06:10

by Andy Shevchenko

Subject: Re: [PATCH] pinctrl: core: Add missing #ifdef CONFIG_GPIOLIB

On Wed, Oct 28, 2020 at 12:40 PM He Zhe <[email protected]> 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 <[email protected]>

> Fixes: f1b206cf7c57 ("pinctrl: core: print gpio in pins debugfs file")
> Signed-off-by: He Zhe <[email protected]>
> ---
> 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
>


--
With Best Regards,
Andy Shevchenko

2020-11-05 13:57:36

by Linus Walleij

Subject: Re: [PATCH] pinctrl: core: Add missing #ifdef CONFIG_GPIOLIB

On Wed, Oct 28, 2020 at 11:40 AM He Zhe <[email protected]> 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 <[email protected]>

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