]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
pinctrl: lantiq: Remove ltq_pmx_disable() function
authorAxel Lin <axel.lin@ingics.com>
Wed, 7 Nov 2012 15:57:59 +0000 (23:57 +0800)
committerLinus Walleij <linus.walleij@linaro.org>
Sun, 11 Nov 2012 18:36:09 +0000 (19:36 +0100)
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>
drivers/pinctrl/pinctrl-lantiq.c

index 07ba7682cf22f57547ad471ae1933dc43c572daa..d670ad6e6e4996251d93eca3da9bd5c42b9dd41f 100644 (file)
@@ -275,16 +275,6 @@ static int ltq_pmx_enable(struct pinctrl_dev *pctrldev,
        return 0;
 }
 
-static void ltq_pmx_disable(struct pinctrl_dev *pctrldev,
-                               unsigned func,
-                               unsigned group)
-{
-       /*
-        * Nothing to do here. However, pinconf_check_ops() requires this
-        * callback to be defined.
-        */
-}
-
 static int ltq_pmx_gpio_request_enable(struct pinctrl_dev *pctrldev,
                                struct pinctrl_gpio_range *range,
                                unsigned pin)
@@ -312,7 +302,6 @@ static struct pinmux_ops ltq_pmx_ops = {
        .get_function_name      = ltq_pmx_func_name,
        .get_function_groups    = ltq_pmx_get_groups,
        .enable                 = ltq_pmx_enable,
-       .disable                = ltq_pmx_disable,
        .gpio_request_enable    = ltq_pmx_gpio_request_enable,
 };