diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2014-09-03 07:02:56 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-09-04 04:05:07 -0400 |
commit | 03e9f0cac5da6af85758276cb4624caf5911f2b9 (patch) | |
tree | ce79c1a080347a615b82f2805296f3e3091c01c1 /drivers/pinctrl/pinctrl-rockchip.c | |
parent | 327455817a92522e669d2d11367e42af5956a8ed (diff) |
pinctrl: clean up after enable refactoring
commit 2243a87d90b42eb38bc281957df3e57c712b5e56
"pinctrl: avoid duplicated calling enable_pinmux_setting for a pin"
removed the .disable callback from the struct pinmux_ops,
making the .enable() callback the only remaining callback.
However .enable() is a bad name as it seems to imply that a
muxing can also be disabled. Rename the callback to .set_mux()
and also take this opportunity to clean out any remaining
mentions of .disable() from the documentation.
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Acked-by: Fan Wu <fwu@marvell.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-rockchip.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-rockchip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index 5e8b2e04cd7a..b91b966add8f 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c | |||
@@ -813,8 +813,8 @@ static int rockchip_pmx_get_groups(struct pinctrl_dev *pctldev, | |||
813 | return 0; | 813 | return 0; |
814 | } | 814 | } |
815 | 815 | ||
816 | static int rockchip_pmx_enable(struct pinctrl_dev *pctldev, unsigned selector, | 816 | static int rockchip_pmx_set(struct pinctrl_dev *pctldev, unsigned selector, |
817 | unsigned group) | 817 | unsigned group) |
818 | { | 818 | { |
819 | struct rockchip_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); | 819 | struct rockchip_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); |
820 | const unsigned int *pins = info->groups[group].pins; | 820 | const unsigned int *pins = info->groups[group].pins; |
@@ -889,7 +889,7 @@ static const struct pinmux_ops rockchip_pmx_ops = { | |||
889 | .get_functions_count = rockchip_pmx_get_funcs_count, | 889 | .get_functions_count = rockchip_pmx_get_funcs_count, |
890 | .get_function_name = rockchip_pmx_get_func_name, | 890 | .get_function_name = rockchip_pmx_get_func_name, |
891 | .get_function_groups = rockchip_pmx_get_groups, | 891 | .get_function_groups = rockchip_pmx_get_groups, |
892 | .enable = rockchip_pmx_enable, | 892 | .set_mux = rockchip_pmx_set, |
893 | .gpio_set_direction = rockchip_pmx_gpio_set_direction, | 893 | .gpio_set_direction = rockchip_pmx_gpio_set_direction, |
894 | }; | 894 | }; |
895 | 895 | ||