Message ID | 20221215163822.542622-1-arnd@kernel.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | pinctrl: sp7021: fix unused function warning | expand |
On Thu, Dec 15, 2022 at 5:38 PM Arnd Bergmann <arnd@kernel.org> wrote: > From: Arnd Bergmann <arnd@arndb.de> > > sppctl_gpio_inv_get is only used from the debugfs code inside > of an #ifdef, so we get a warning without that: > > drivers/pinctrl/sunplus/sppctl.c:393:12: error: 'sppctl_gpio_inv_get' defined but not used [-Werror=unused-function] > 393 | static int sppctl_gpio_inv_get(struct gpio_chip *chip, unsigned int offset) > | ^~~~~~~~~~~~~~~~~~~ > > Replace the #ifdef with an IS_ENABLED() check that avoids the warning. > > Fixes: aa74c44be19c ("pinctrl: Add driver for Sunplus SP7021") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Patch applied! Yours, Linus Walleij
On Thu, Dec 15, 2022 at 05:38:10PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > sppctl_gpio_inv_get is only used from the debugfs code inside > of an #ifdef, so we get a warning without that: > > drivers/pinctrl/sunplus/sppctl.c:393:12: error: 'sppctl_gpio_inv_get' defined but not used [-Werror=unused-function] > 393 | static int sppctl_gpio_inv_get(struct gpio_chip *chip, unsigned int offset) > | ^~~~~~~~~~~~~~~~~~~ > > Replace the #ifdef with an IS_ENABLED() check that avoids the warning. I;m wondering why we can't use PTR_IF() here and in similar cases...
diff --git a/drivers/pinctrl/sunplus/sppctl.c b/drivers/pinctrl/sunplus/sppctl.c index 2b3335ab56c6..25101293268f 100644 --- a/drivers/pinctrl/sunplus/sppctl.c +++ b/drivers/pinctrl/sunplus/sppctl.c @@ -499,7 +499,6 @@ static int sppctl_gpio_set_config(struct gpio_chip *chip, unsigned int offset, return 0; } -#ifdef CONFIG_DEBUG_FS static void sppctl_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) { const char *label; @@ -521,7 +520,6 @@ static void sppctl_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) seq_puts(s, "\n"); } } -#endif static int sppctl_gpio_new(struct platform_device *pdev, struct sppctl_pdata *pctl) { @@ -550,9 +548,8 @@ static int sppctl_gpio_new(struct platform_device *pdev, struct sppctl_pdata *pc gchip->get = sppctl_gpio_get; gchip->set = sppctl_gpio_set; gchip->set_config = sppctl_gpio_set_config; -#ifdef CONFIG_DEBUG_FS - gchip->dbg_show = sppctl_gpio_dbg_show; -#endif + gchip->dbg_show = IS_ENABLED(CONFIG_DEBUG_FS) ? + sppctl_gpio_dbg_show : NULL; gchip->base = -1; gchip->ngpio = sppctl_gpio_list_sz; gchip->names = sppctl_gpio_list_s;