pinctrl: equilibrium: Unshadow error code of of_property_count_u32_elems()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 29 Nov 2023 16:06:26 +0000 (18:06 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 1 Dec 2023 14:00:10 +0000 (15:00 +0100)
of_property_count_u32_elems() might return an error code in some cases.
It's naturally better to assign what it's returned to the err variable
and supply the real code to the upper layer(s). Besides that, it's a
common practice to avoid assignments for the data in cases when we know
that the error condition happened. Refactor the code accordingly.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20231129161459.1002323-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-equilibrium.c

index 5b5ddf7e5d0eb10a9ec8cc4154f29e8fe895e7ee..54755b583d3fa8a787f533a5a4025140b093952e 100644 (file)
@@ -715,12 +715,13 @@ static int eqbr_build_groups(struct eqbr_pinctrl_drv_data *drvdata)
                if (!prop)
                        continue;
 
-               group.num_pins = of_property_count_u32_elems(np, "pins");
-               if (group.num_pins < 0) {
+               err = of_property_count_u32_elems(np, "pins");
+               if (err < 0) {
                        dev_err(dev, "No pins in the group: %s\n", prop->name);
                        of_node_put(np);
-                       return -EINVAL;
+                       return err;
                }
+               group.num_pins = err;
                group.name = prop->value;
                group.pins = devm_kcalloc(dev, group.num_pins,
                                          sizeof(*(group.pins)), GFP_KERNEL);