Merge tag 'pinctrl-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[deliverable/linux.git] / drivers / pinctrl / vt8500 / pinctrl-wmt.c

diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c
index 2c61281bebd7666f6b12e87a7618c47a3a3aae18..8cea355f9a810ebd6babf1c49c0da00257029752 100644 (file)
--- a/drivers/pinctrl/vt8500/pinctrl-wmt.c
+++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c
@@ -141,17 +141,6 @@ static int wmt_pmx_enable(struct pinctrl_dev *pctldev,
        return wmt_set_pinmux(data, func_selector, pinnum);
 }
 
-static void wmt_pmx_disable(struct pinctrl_dev *pctldev,
-                           unsigned func_selector,
-                           unsigned group_selector)
-{
-       struct wmt_pinctrl_data *data = pinctrl_dev_get_drvdata(pctldev);
-       u32 pinnum = data->pins[group_selector].number;
-
-       /* disable by setting GPIO_IN */
-       wmt_set_pinmux(data, WMT_FSEL_GPIO_IN, pinnum);
-}
-
 static void wmt_pmx_gpio_disable_free(struct pinctrl_dev *pctldev,
                                      struct pinctrl_gpio_range *range,
                                      unsigned offset)
@@ -180,7 +169,6 @@ static struct pinmux_ops wmt_pinmux_ops = {
        .get_function_name = wmt_pmx_get_function_name,
        .get_function_groups = wmt_pmx_get_function_groups,
        .enable = wmt_pmx_enable,
-       .disable = wmt_pmx_disable,
        .gpio_disable_free = wmt_pmx_gpio_disable_free,
        .gpio_set_direction = wmt_pmx_gpio_set_direction,
 };
@@ -627,8 +615,7 @@ int wmt_pinctrl_probe(struct platform_device *pdev,
        return 0;
 
 fail_range:
-       if (gpiochip_remove(&data->gpio_chip))
-               dev_err(&pdev->dev, "failed to remove gpio chip\n");
+       gpiochip_remove(&data->gpio_chip);
 fail_gpio:
        pinctrl_unregister(data->pctl_dev);
        return err;
@@ -637,12 +624,8 @@ fail_gpio:
 int wmt_pinctrl_remove(struct platform_device *pdev)
 {
        struct wmt_pinctrl_data *data = platform_get_drvdata(pdev);
-       int err;
-
-       err = gpiochip_remove(&data->gpio_chip);
-       if (err)
-               dev_err(&pdev->dev, "failed to remove gpio chip\n");
 
+       gpiochip_remove(&data->gpio_chip);
        pinctrl_unregister(data->pctl_dev);
 
        return 0;