diff options
| author | Irina Tirdea <irina.tirdea@intel.com> | 2016-03-31 07:44:42 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-04-01 09:06:36 -0400 |
| commit | d32f7fd3bbc32732b094d938b95169521503a9fb (patch) | |
| tree | e56a11bd147937e40e27db57a47276557be1a001 /drivers/pinctrl/tegra | |
| parent | 20b3d2a79f0f9ff1ac189f43df7598d0e968210a (diff) | |
pinctrl: Rename pinctrl_utils_dt_free_map to pinctrl_utils_free_map
Rename pinctrl_utils_dt_free_map to pinctrl_utils_free_map, since
it does not depend on device tree despite the current name. This
will enforce a consistent naming in pinctr-utils.c and will make
it clear it can be called from outside device tree (e.g. from
ACPI handling code).
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/tegra')
| -rw-r--r-- | drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/tegra/pinctrl-tegra.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c b/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c index 2f06029c9405..e58b5f344b34 100644 --- a/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c +++ b/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | |||
| @@ -267,7 +267,7 @@ static const struct pinctrl_ops tegra_xusb_padctl_pinctrl_ops = { | |||
| 267 | .get_group_name = tegra_xusb_padctl_get_group_name, | 267 | .get_group_name = tegra_xusb_padctl_get_group_name, |
| 268 | .get_group_pins = tegra_xusb_padctl_get_group_pins, | 268 | .get_group_pins = tegra_xusb_padctl_get_group_pins, |
| 269 | .dt_node_to_map = tegra_xusb_padctl_dt_node_to_map, | 269 | .dt_node_to_map = tegra_xusb_padctl_dt_node_to_map, |
| 270 | .dt_free_map = pinctrl_utils_dt_free_map, | 270 | .dt_free_map = pinctrl_utils_free_map, |
| 271 | }; | 271 | }; |
| 272 | 272 | ||
| 273 | static int tegra_xusb_padctl_get_functions_count(struct pinctrl_dev *pinctrl) | 273 | static int tegra_xusb_padctl_get_functions_count(struct pinctrl_dev *pinctrl) |
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra.c b/drivers/pinctrl/tegra/pinctrl-tegra.c index 49388822c0e9..3f7fce9075ab 100644 --- a/drivers/pinctrl/tegra/pinctrl-tegra.c +++ b/drivers/pinctrl/tegra/pinctrl-tegra.c | |||
| @@ -215,7 +215,7 @@ static int tegra_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev, | |||
| 215 | ret = tegra_pinctrl_dt_subnode_to_map(pctldev, np, map, | 215 | ret = tegra_pinctrl_dt_subnode_to_map(pctldev, np, map, |
| 216 | &reserved_maps, num_maps); | 216 | &reserved_maps, num_maps); |
| 217 | if (ret < 0) { | 217 | if (ret < 0) { |
| 218 | pinctrl_utils_dt_free_map(pctldev, *map, | 218 | pinctrl_utils_free_map(pctldev, *map, |
| 219 | *num_maps); | 219 | *num_maps); |
| 220 | of_node_put(np); | 220 | of_node_put(np); |
| 221 | return ret; | 221 | return ret; |
| @@ -233,7 +233,7 @@ static const struct pinctrl_ops tegra_pinctrl_ops = { | |||
| 233 | .pin_dbg_show = tegra_pinctrl_pin_dbg_show, | 233 | .pin_dbg_show = tegra_pinctrl_pin_dbg_show, |
| 234 | #endif | 234 | #endif |
| 235 | .dt_node_to_map = tegra_pinctrl_dt_node_to_map, | 235 | .dt_node_to_map = tegra_pinctrl_dt_node_to_map, |
| 236 | .dt_free_map = pinctrl_utils_dt_free_map, | 236 | .dt_free_map = pinctrl_utils_free_map, |
| 237 | }; | 237 | }; |
| 238 | 238 | ||
| 239 | static int tegra_pinctrl_get_funcs_count(struct pinctrl_dev *pctldev) | 239 | static int tegra_pinctrl_get_funcs_count(struct pinctrl_dev *pctldev) |
