Commit 0d74d4a1 authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: add includes and ifdefs for non-DT builds 



Commit e81c8f18
"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: default avatarOlof Johansson <olof@lixom.net>
Cc: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f84b4171

include/linux/pinctrl/pinconf-generic.h

+9 −0
Original line number Diff line number Diff line
@@ -137,12 +137,21 @@ static inline unsigned long pinconf_to_config_packed(enum pin_config_param param 
	return PIN_CONF_PACKED(param, argument);

}



#ifdef CONFIG_OF



#include <linux/device.h>

struct pinctrl_dev;

struct pinctrl_map;



int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev,

		struct device_node *np, struct pinctrl_map **map,

		unsigned *reserved_maps, unsigned *num_maps);

int pinconf_generic_dt_node_to_map(struct pinctrl_dev *pctldev,

		struct device_node *np_config, struct pinctrl_map **map,

		unsigned *num_maps);



#endif



#endif /* CONFIG_GENERIC_PINCONF */



#endif /* __LINUX_PINCTRL_PINCONF_GENERIC_H */