diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-06-23 11:19:14 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-06-23 11:19:14 +0200 |
| commit | dd032e8dc55254cb22b529901889c5a5b9c03177 (patch) | |
| tree | 972ce7afece5db6481f90d0f43ed64f5f967a437 | |
| parent | 7440926ed9623dceca3310c5f437d06c859dc02b (diff) | |
| parent | 8dfebf57bd3668adbca747d54406fb3237e47b23 (diff) | |
| download | talos-obmc-linux-dd032e8dc55254cb22b529901889c5a5b9c03177.tar.gz talos-obmc-linux-dd032e8dc55254cb22b529901889c5a5b9c03177.zip | |
Merge branch 'devel-dt-free-map' into devel
| -rw-r--r-- | drivers/pinctrl/pinconf-generic.c | 8 | ||||
| -rw-r--r-- | include/linux/pinctrl/pinconf-generic.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c index 34b601b06764..5020ae534479 100644 --- a/drivers/pinctrl/pinconf-generic.c +++ b/drivers/pinctrl/pinconf-generic.c @@ -395,4 +395,12 @@ exit: } EXPORT_SYMBOL_GPL(pinconf_generic_dt_node_to_map); +void pinconf_generic_dt_free_map(struct pinctrl_dev *pctldev, + struct pinctrl_map *map, + unsigned num_maps) +{ + pinctrl_utils_free_map(pctldev, map, num_maps); +} +EXPORT_SYMBOL_GPL(pinconf_generic_dt_free_map); + #endif diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h index d921afd5f109..12343caa114e 100644 --- a/include/linux/pinctrl/pinconf-generic.h +++ b/include/linux/pinctrl/pinconf-generic.h @@ -175,6 +175,8 @@ int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev, int pinconf_generic_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node *np_config, struct pinctrl_map **map, unsigned *num_maps, enum pinctrl_map_type type); +void pinconf_generic_dt_free_map(struct pinctrl_dev *pctldev, + struct pinctrl_map *map, unsigned num_maps); static inline int pinconf_generic_dt_node_to_map_group( struct pinctrl_dev *pctldev, struct device_node *np_config, |
