pinctrl: Define of_pinctrl_get() dummy for !PINCTRL
authorThierry Reding <treding@nvidia.com>
Mon, 30 Mar 2020 09:58:01 +0000 (11:58 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 31 Mar 2020 20:08:54 +0000 (22:08 +0200)
Currently, the of_pinctrl_get() dummy is only defined for !OF, which can
still cause build failures on configurations with OF enabled but PINCTRL
disabled. Make sure to define the dummy if either OF or PINCTRL are not
enabled.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20200330095801.2421589-1-thierry.reding@gmail.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
include/linux/pinctrl/pinctrl.h

index 7ce23450a1cb4ee6ac5ecb0af20b4b7dbea7c2dc..2aef59df93d70550f10c538537c370c6269836bd 100644 (file)
@@ -186,7 +186,7 @@ extern int pinctrl_get_group_pins(struct pinctrl_dev *pctldev,
                                const char *pin_group, const unsigned **pins,
                                unsigned *num_pins);
 
-#ifdef CONFIG_OF
+#if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_PINCTRL)
 extern struct pinctrl_dev *of_pinctrl_get(struct device_node *np);
 #else
 static inline