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-imx.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-imx.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-imx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c index 946d594a64dd..570e5acb4a6a 100644 --- a/drivers/pinctrl/pinctrl-imx.c +++ b/drivers/pinctrl/pinctrl-imx.c | |||
@@ -179,8 +179,8 @@ static const struct pinctrl_ops imx_pctrl_ops = { | |||
179 | 179 | ||
180 | }; | 180 | }; |
181 | 181 | ||
182 | static int imx_pmx_enable(struct pinctrl_dev *pctldev, unsigned selector, | 182 | static int imx_pmx_set(struct pinctrl_dev *pctldev, unsigned selector, |
183 | unsigned group) | 183 | unsigned group) |
184 | { | 184 | { |
185 | struct imx_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev); | 185 | struct imx_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev); |
186 | const struct imx_pinctrl_soc_info *info = ipctl->info; | 186 | const struct imx_pinctrl_soc_info *info = ipctl->info; |
@@ -298,7 +298,7 @@ static const struct pinmux_ops imx_pmx_ops = { | |||
298 | .get_functions_count = imx_pmx_get_funcs_count, | 298 | .get_functions_count = imx_pmx_get_funcs_count, |
299 | .get_function_name = imx_pmx_get_func_name, | 299 | .get_function_name = imx_pmx_get_func_name, |
300 | .get_function_groups = imx_pmx_get_groups, | 300 | .get_function_groups = imx_pmx_get_groups, |
301 | .enable = imx_pmx_enable, | 301 | .set_mux = imx_pmx_set, |
302 | }; | 302 | }; |
303 | 303 | ||
304 | static int imx_pinconf_get(struct pinctrl_dev *pctldev, | 304 | static int imx_pinconf_get(struct pinctrl_dev *pctldev, |