diff mbox series

pinctrl: Define of_pinctrl_get() dummy for !PINCTRL

Message ID 20200330095801.2421589-1-thierry.reding@gmail.com
State New
Headers show
Series pinctrl: Define of_pinctrl_get() dummy for !PINCTRL | expand

Commit Message

Thierry Reding March 30, 2020, 9:58 a.m. UTC 
From: Thierry Reding <treding@nvidia.com>

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>
---
 include/linux/pinctrl/pinctrl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Linus Walleij March 31, 2020, 8:09 p.m. UTC | #1 
On Mon, Mar 30, 2020 at 11:58 AM Thierry Reding
<thierry.reding@gmail.com> wrote:

> From: Thierry Reding <treding@nvidia.com>
>
> 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>

Patch applied.

Yours,
Linus Walleij
diff mbox series

Patch

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