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-adi2.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-adi2.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-adi2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c index b092b93c67a1..e02943b0285d 100644 --- a/drivers/pinctrl/pinctrl-adi2.c +++ b/drivers/pinctrl/pinctrl-adi2.c | |||
@@ -619,8 +619,8 @@ static struct pinctrl_ops adi_pctrl_ops = { | |||
619 | .get_group_pins = adi_get_group_pins, | 619 | .get_group_pins = adi_get_group_pins, |
620 | }; | 620 | }; |
621 | 621 | ||
622 | static int adi_pinmux_enable(struct pinctrl_dev *pctldev, unsigned func_id, | 622 | static int adi_pinmux_set(struct pinctrl_dev *pctldev, unsigned func_id, |
623 | unsigned group_id) | 623 | unsigned group_id) |
624 | { | 624 | { |
625 | struct adi_pinctrl *pinctrl = pinctrl_dev_get_drvdata(pctldev); | 625 | struct adi_pinctrl *pinctrl = pinctrl_dev_get_drvdata(pctldev); |
626 | struct gpio_port *port; | 626 | struct gpio_port *port; |
@@ -698,7 +698,7 @@ static int adi_pinmux_request_gpio(struct pinctrl_dev *pctldev, | |||
698 | } | 698 | } |
699 | 699 | ||
700 | static struct pinmux_ops adi_pinmux_ops = { | 700 | static struct pinmux_ops adi_pinmux_ops = { |
701 | .enable = adi_pinmux_enable, | 701 | .set_mux = adi_pinmux_set, |
702 | .get_functions_count = adi_pinmux_get_funcs_count, | 702 | .get_functions_count = adi_pinmux_get_funcs_count, |
703 | .get_function_name = adi_pinmux_get_func_name, | 703 | .get_function_name = adi_pinmux_get_func_name, |
704 | .get_function_groups = adi_pinmux_get_groups, | 704 | .get_function_groups = adi_pinmux_get_groups, |