Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit caee57ec authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Walleij
Browse files

pinctrl: nomadik: hide nmk_gpio_get_mode when unused 



nmk_gpio_get_mode is only used in one place, and that is conditionally
compiled if DEBUG_FS is enabled. A recent cleanup has marked the
definition 'static', which now leads to a warning:

drivers/pinctrl/nomadik/pinctrl-nomadik.c:614:12: error: 'nmk_gpio_get_mode' defined but not used [-Werror=unused-function]
 static int nmk_gpio_get_mode(struct nmk_gpio_chip *nmk_chip, int offset)
            ^~~~~~~~~~~~~~~~~

Moving the function itself inside the #ifdef shuts it up again.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 5e81e0a0 ("pinctrl: nomadik: use BIT() with offsets consequently")
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 9d814d41

drivers/pinctrl/nomadik/pinctrl-nomadik.c

+13 −14
Original line number Diff line number Diff line
@@ -611,20 +611,6 @@ static int __maybe_unused nmk_prcm_gpiocr_get_mode(struct pinctrl_dev *pctldev, 
	return NMK_GPIO_ALT_C;

}



static int nmk_gpio_get_mode(struct nmk_gpio_chip *nmk_chip, int offset)

{

	u32 afunc, bfunc;



	clk_enable(nmk_chip->clk);



	afunc = readl(nmk_chip->addr + NMK_GPIO_AFSLA) & BIT(offset);

	bfunc = readl(nmk_chip->addr + NMK_GPIO_AFSLB) & BIT(offset);



	clk_disable(nmk_chip->clk);



	return (afunc ? NMK_GPIO_ALT_A : 0) | (bfunc ? NMK_GPIO_ALT_B : 0);

}



/* IRQ functions */



static void nmk_gpio_irq_ack(struct irq_data *d)
@@ -929,6 +915,19 @@ static int nmk_gpio_make_output(struct gpio_chip *chip, unsigned offset, 
}



#ifdef CONFIG_DEBUG_FS

static int nmk_gpio_get_mode(struct nmk_gpio_chip *nmk_chip, int offset)

{

	u32 afunc, bfunc;



	clk_enable(nmk_chip->clk);



	afunc = readl(nmk_chip->addr + NMK_GPIO_AFSLA) & BIT(offset);

	bfunc = readl(nmk_chip->addr + NMK_GPIO_AFSLB) & BIT(offset);



	clk_disable(nmk_chip->clk);



	return (afunc ? NMK_GPIO_ALT_A : 0) | (bfunc ? NMK_GPIO_ALT_B : 0);

}



#include <linux/seq_file.h>