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

[linux-2.6-microblaze.git] / drivers / pinctrl / pinctrl-single.c

diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index aa6e722..67bec7e 100644 (file)
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -1115,7 +1115,7 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs,
 {
        const char *name = "pinctrl-single,bits";
        struct pcs_func_vals *vals;
-       int rows, *pins, found = 0, res = -ENOMEM, i, fsel, gsel;
+       int rows, *pins, found = 0, res = -ENOMEM, i, fsel;
        int npins_in_row;
        struct pcs_function *function = NULL;
 
@@ -1125,6 +1125,11 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs,
                return -EINVAL;
        }
 
+       if (PCS_HAS_PINCONF) {
+               dev_err(pcs->dev, "pinconf not supported\n");
+               return -ENOTSUPP;
+       }
+
        npins_in_row = pcs->width / pcs->bits_per_pin;
 
        vals = devm_kzalloc(pcs->dev,
@@ -1212,29 +1217,19 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs,
                goto free_pins;
        }
 
-       gsel = pinctrl_generic_add_group(pcs->pctl, np->name, pins, found, pcs);
-       if (gsel < 0) {
-               res = gsel;
+       res = pinctrl_generic_add_group(pcs->pctl, np->name, pins, found, pcs);
+       if (res < 0)
                goto free_function;
-       }
 
        (*map)->type = PIN_MAP_TYPE_MUX_GROUP;
        (*map)->data.mux.group = np->name;
        (*map)->data.mux.function = np->name;
 
-       if (PCS_HAS_PINCONF) {
-               dev_err(pcs->dev, "pinconf not supported\n");
-               goto free_pingroups;
-       }
-
        *num_maps = 1;
        mutex_unlock(&pcs->mutex);
 
        return 0;
 
-free_pingroups:
-       pinctrl_generic_remove_group(pcs->pctl, gsel);
-       *num_maps = 1;
 free_function:
        pinmux_generic_remove_function(pcs->pctl, fsel);
 free_pins: