提交 7e2ba273 编写于 作者: H He Zhe 提交者: Xie XiuQi

pinctrl: core: Add missing #ifdef CONFIG_GPIOLIB

stable inclusion
from stable-5.10.4
commit 3b0c3b66b6b96ac9beee774b8e505b142192539b
bugzilla: 46903

--------------------------------

[ Upstream commit b507cb92 ]

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: f1b206cf ("pinctrl: core: print gpio in pins debugfs file")
Signed-off-by: NHe Zhe <zhe.he@windriver.com>
Reviewed-by: NAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20201028103921.22486-1-zhe.he@windriver.comSigned-off-by: NLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 901c199c
...@@ -1602,9 +1602,11 @@ static int pinctrl_pins_show(struct seq_file *s, void *what) ...@@ -1602,9 +1602,11 @@ static int pinctrl_pins_show(struct seq_file *s, void *what)
struct pinctrl_dev *pctldev = s->private; struct pinctrl_dev *pctldev = s->private;
const struct pinctrl_ops *ops = pctldev->desc->pctlops; const struct pinctrl_ops *ops = pctldev->desc->pctlops;
unsigned i, pin; unsigned i, pin;
#ifdef CONFIG_GPIOLIB
struct pinctrl_gpio_range *range; struct pinctrl_gpio_range *range;
unsigned int gpio_num; unsigned int gpio_num;
struct gpio_chip *chip; struct gpio_chip *chip;
#endif
seq_printf(s, "registered pins: %d\n", pctldev->desc->npins); seq_printf(s, "registered pins: %d\n", pctldev->desc->npins);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册