diff options
author | Axel Lin <axel.lin@ingics.com> | 2012-11-07 10:57:59 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-11 13:36:09 -0500 |
commit | 5c084ec82015553ab8972cd251fc2e5757e4a379 (patch) | |
tree | fa015602cbdf508166d2455017341a489c0353cb /drivers/pinctrl/pinctrl-lantiq.c | |
parent | 826d6ca8f955c7a902e775acef3bdbfc93695b04 (diff) |
pinctrl: lantiq: Remove ltq_pmx_disable() function
Current code adds empty ltq_pmx_disable() because pinmux_check_ops() requires
this callback to be defined.
This is not required since commit 02b50ce4cb1
"pinctrl: make pinmux disable function optional".
Thus remove ltq_pmx_disable() function.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: John Crispin <blogic@openwrt.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-lantiq.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-lantiq.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/pinctrl/pinctrl-lantiq.c b/drivers/pinctrl/pinctrl-lantiq.c index 07ba7682cf22..d670ad6e6e49 100644 --- a/drivers/pinctrl/pinctrl-lantiq.c +++ b/drivers/pinctrl/pinctrl-lantiq.c | |||
@@ -275,16 +275,6 @@ static int ltq_pmx_enable(struct pinctrl_dev *pctrldev, | |||
275 | return 0; | 275 | return 0; |
276 | } | 276 | } |
277 | 277 | ||
278 | static void ltq_pmx_disable(struct pinctrl_dev *pctrldev, | ||
279 | unsigned func, | ||
280 | unsigned group) | ||
281 | { | ||
282 | /* | ||
283 | * Nothing to do here. However, pinconf_check_ops() requires this | ||
284 | * callback to be defined. | ||
285 | */ | ||
286 | } | ||
287 | |||
288 | static int ltq_pmx_gpio_request_enable(struct pinctrl_dev *pctrldev, | 278 | static int ltq_pmx_gpio_request_enable(struct pinctrl_dev *pctrldev, |
289 | struct pinctrl_gpio_range *range, | 279 | struct pinctrl_gpio_range *range, |
290 | unsigned pin) | 280 | unsigned pin) |
@@ -312,7 +302,6 @@ static struct pinmux_ops ltq_pmx_ops = { | |||
312 | .get_function_name = ltq_pmx_func_name, | 302 | .get_function_name = ltq_pmx_func_name, |
313 | .get_function_groups = ltq_pmx_get_groups, | 303 | .get_function_groups = ltq_pmx_get_groups, |
314 | .enable = ltq_pmx_enable, | 304 | .enable = ltq_pmx_enable, |
315 | .disable = ltq_pmx_disable, | ||
316 | .gpio_request_enable = ltq_pmx_gpio_request_enable, | 305 | .gpio_request_enable = ltq_pmx_gpio_request_enable, |
317 | }; | 306 | }; |
318 | 307 | ||