Merge remote-tracking branch 'gpio/for-next'

[karo-tx-linux.git] / drivers / pinctrl / pinctrl-palmas.c

diff --git a/drivers/pinctrl/pinctrl-palmas.c b/drivers/pinctrl/pinctrl-palmas.c
index 30c4d356cb33510a550aec1d467ac40936552a60..f13d0e78a41ca649583911c1cc90fc78c6490e4c 100644 (file)
--- a/drivers/pinctrl/pinctrl-palmas.c
+++ b/drivers/pinctrl/pinctrl-palmas.c
@@ -891,9 +891,6 @@ static int palmas_pinconf_set(struct pinctrl_dev *pctldev,
                param = pinconf_to_config_param(configs[i]);
                param_val = pinconf_to_config_argument(configs[i]);
 
-               if (param == PIN_CONFIG_BIAS_PULL_PIN_DEFAULT)
-                       continue;
-
                switch (param) {
                case PIN_CONFIG_BIAS_DISABLE:
                case PIN_CONFIG_BIAS_PULL_UP:
@@ -962,26 +959,9 @@ static int palmas_pinconf_set(struct pinctrl_dev *pctldev,
        return 0;
 }
 
-static int palmas_pinconf_group_get(struct pinctrl_dev *pctldev,
-                               unsigned group, unsigned long *config)
-{
-       dev_err(pctldev->dev, "palmas_pinconf_group_get op not supported\n");
-       return -ENOTSUPP;
-}
-
-static int palmas_pinconf_group_set(struct pinctrl_dev *pctldev,
-                               unsigned group, unsigned long *configs,
-                               unsigned num_configs)
-{
-       dev_err(pctldev->dev, "palmas_pinconf_group_set op not supported\n");
-       return -ENOTSUPP;
-}
-
 static const struct pinconf_ops palmas_pinconf_ops = {
        .pin_config_get = palmas_pinconf_get,
        .pin_config_set = palmas_pinconf_set,
-       .pin_config_group_get = palmas_pinconf_group_get,
-       .pin_config_group_set = palmas_pinconf_group_set,
 };
 
 static struct pinctrl_desc palmas_pinctrl_desc = {