aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pinctrl/pinconf-generic.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-08-15 15:38:49 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-08-15 16:12:46 -0400
commit0d74d4a161c9f9870039af414b712552c0ed6dfb (patch)
treec5f13843f5bcba0cdebd7aef3a297a58e73b7820 /include/linux/pinctrl/pinconf-generic.h
parentf84b4171312a59924c22b817c8f83c1749a8e8ba (diff)
pinctrl: add includes and ifdefs for non-DT builds
Commit e81c8f18afc4fdd6e34d8c83814b8b5134dbb30f "pinctrl: pinconf-generic: add generic APIs for mapping pinctrl node" Added function prototypes with implicit dependencies on other header files causing build warnings like this: In file included from arch/arm/mach-ux500/board-mop500-pins.c:12:0: include/linux/pinctrl/pinconf-generic.h:142:3: warning: 'struct device_node' declared inside parameter list [enabled by default] unsigned *reserved_maps, unsigned *num_maps); ^ include/linux/pinctrl/pinconf-generic.h:142:3: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] include/linux/pinctrl/pinconf-generic.h:142:3: warning: 'struct pinctrl_dev' declared inside parameter list [enabled by default] include/linux/pinctrl/pinconf-generic.h:145:3: warning: 'struct device_node' declared inside parameter list [enabled by default] unsigned *num_maps); ^ Let's just add ifdefs for non-DT systems (the actual code is already ifdefed) and #include <linux/device.h> to get the most important structs and forward-declare the pinctrl core structs. Reported-by: Olof Johansson <olof@lixom.net> Cc: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/linux/pinctrl/pinconf-generic.h')
-rw-r--r--include/linux/pinctrl/pinconf-generic.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h
index a472b93292a3..83f5179ea0c5 100644
--- a/include/linux/pinctrl/pinconf-generic.h
+++ b/include/linux/pinctrl/pinconf-generic.h
@@ -137,12 +137,21 @@ static inline unsigned long pinconf_to_config_packed(enum pin_config_param param
137 return PIN_CONF_PACKED(param, argument); 137 return PIN_CONF_PACKED(param, argument);
138} 138}
139 139
140#ifdef CONFIG_OF
141
142#include <linux/device.h>
143struct pinctrl_dev;
144struct pinctrl_map;
145
140int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev, 146int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev,
141 struct device_node *np, struct pinctrl_map **map, 147 struct device_node *np, struct pinctrl_map **map,
142 unsigned *reserved_maps, unsigned *num_maps); 148 unsigned *reserved_maps, unsigned *num_maps);
143int pinconf_generic_dt_node_to_map(struct pinctrl_dev *pctldev, 149int pinconf_generic_dt_node_to_map(struct pinctrl_dev *pctldev,
144 struct device_node *np_config, struct pinctrl_map **map, 150 struct device_node *np_config, struct pinctrl_map **map,
145 unsigned *num_maps); 151 unsigned *num_maps);
152
153#endif
154
146#endif /* CONFIG_GENERIC_PINCONF */ 155#endif /* CONFIG_GENERIC_PINCONF */
147 156
148#endif /* __LINUX_PINCTRL_PINCONF_GENERIC_H */ 157#endif /* __LINUX_PINCTRL_PINCONF_GENERIC_H */