aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pinctrl
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2020-03-30 11:58:01 +0200
committerLinus Walleij <linus.walleij@linaro.org>2020-03-31 22:08:54 +0200
commite45ee71ae101bd271c3cd951cf66341dc8f504a0 (patch)
treed6a165369403e79f620cd8b4be3e94addf549ec7 /include/linux/pinctrl
parentgpio: Rename variable in core APIs (diff)
downloadlinux-dev-e45ee71ae101bd271c3cd951cf66341dc8f504a0.tar.xz
linux-dev-e45ee71ae101bd271c3cd951cf66341dc8f504a0.zip
pinctrl: Define of_pinctrl_get() dummy for !PINCTRL
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>
Diffstat (limited to 'include/linux/pinctrl')
-rw-r--r--include/linux/pinctrl/pinctrl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h
index 7ce23450a1cb..2aef59df93d7 100644
--- a/include/linux/pinctrl/pinctrl.h
+++ b/include/linux/pinctrl/pinctrl.h
@@ -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