Skip to content

Commit fa63587

Browse files
MaxKellermannlinusw
authored andcommitted
drivers/gpio/nomadik: move dummy nmk_gpio_dbg_show_one() to header
When `CONFIG_DEBUG_FS` is disabled, nmk_gpio_dbg_show_one() is an empty dummy function; this however triggers a `-Wmissing-prototypes` warning and later a linker error because the function is also used by drivers/pinctrl/nomadik/pinctrl-nomadik.c, therefore it needs to be non-static. To allow both sources to access this dummy function, this patch moves it to the header, adding the `#ifdef CONFIG_DEBUG_FS` there as well. Signed-off-by: Max Kellermann <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent 289b950 commit fa63587

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

drivers/gpio/gpio-nomadik.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -486,14 +486,6 @@ static void nmk_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
486486

487487
#else
488488

489-
static inline void nmk_gpio_dbg_show_one(struct seq_file *s,
490-
struct pinctrl_dev *pctldev,
491-
struct gpio_chip *chip,
492-
unsigned int offset,
493-
unsigned int gpio)
494-
{
495-
}
496-
497489
#define nmk_gpio_dbg_show NULL
498490

499491
#endif

include/linux/gpio/gpio-nomadik.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,8 @@ nmk_pinctrl_db8540_init(const struct nmk_pinctrl_soc_data **soc)
253253

254254
struct platform_device;
255255

256+
#ifdef CONFIG_DEBUG_FS
257+
256258
/*
257259
* Symbols declared in gpio-nomadik used by pinctrl-nomadik. If pinctrl-nomadik
258260
* is enabled, then gpio-nomadik is enabled as well; the reverse if not always
@@ -261,6 +263,19 @@ struct platform_device;
261263
void nmk_gpio_dbg_show_one(struct seq_file *s, struct pinctrl_dev *pctldev,
262264
struct gpio_chip *chip, unsigned int offset,
263265
unsigned int gpio);
266+
267+
#else
268+
269+
static inline void nmk_gpio_dbg_show_one(struct seq_file *s,
270+
struct pinctrl_dev *pctldev,
271+
struct gpio_chip *chip,
272+
unsigned int offset,
273+
unsigned int gpio)
274+
{
275+
}
276+
277+
#endif
278+
264279
void __nmk_gpio_make_output(struct nmk_gpio_chip *nmk_chip,
265280
unsigned int offset, int val);
266281
void __nmk_gpio_set_slpm(struct nmk_gpio_chip *nmk_chip, unsigned int offset,

0 commit comments

Comments
 (0)