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, 5 insertions, 5 deletions

diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index c055daf9a80f..b874458dcb88 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -41,7 +41,7 @@ int pinmux_check_ops(struct pinctrl_dev *pctldev)
             !ops->get_functions_count ||
             !ops->get_function_name ||
             !ops->get_function_groups ||
-            !ops->enable) {
+            !ops->set_mux) {
                 dev_err(pctldev->dev, "pinmux ops lacks necessary functions\n");
                 return -EINVAL;
         }
@@ -445,15 +445,15 @@ int pinmux_enable_setting(struct pinctrl_setting const *setting)
                 desc->mux_setting = &(setting->data.mux);
         }
 
-        ret = ops->enable(pctldev, setting->data.mux.func,
-                          setting->data.mux.group);
+        ret = ops->set_mux(pctldev, setting->data.mux.func,
+                           setting->data.mux.group);
 
         if (ret)
-                goto err_enable;
+                goto err_set_mux;
 
         return 0;
 
-err_enable:
+err_set_mux:
         for (i = 0; i < num_pins; i++) {
                 desc = pin_desc_get(pctldev, pins[i]);
                 if (desc)