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>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c
index 8cea355f9a81..d055d63309e4 100644
--- a/drivers/pinctrl/vt8500/pinctrl-wmt.c
+++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c
@@ -131,9 +131,9 @@ static int wmt_set_pinmux(struct wmt_pinctrl_data *data, unsigned func,
         return 0;
 }
 
-static int wmt_pmx_enable(struct pinctrl_dev *pctldev,
-                          unsigned func_selector,
-                          unsigned group_selector)
+static int wmt_pmx_set_mux(struct pinctrl_dev *pctldev,
+                           unsigned func_selector,
+                           unsigned group_selector)
 {
         struct wmt_pinctrl_data *data = pinctrl_dev_get_drvdata(pctldev);
         u32 pinnum = data->pins[group_selector].number;
@@ -168,7 +168,7 @@ static struct pinmux_ops wmt_pinmux_ops = {
         .get_functions_count = wmt_pmx_get_functions_count,
         .get_function_name = wmt_pmx_get_function_name,
         .get_function_groups = wmt_pmx_get_function_groups,
-        .enable = wmt_pmx_enable,
+        .set_mux = wmt_pmx_set_mux,
         .gpio_disable_free = wmt_pmx_gpio_disable_free,
         .gpio_set_direction = wmt_pmx_gpio_set_direction,
 };