Commit 271e6a04 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij

pinctrl: equilibrium: Use temporary variable to hold pins

The pins are allocated from the heap, but in order to pass
them as constant object, we need to use non-constant pointer.
Achieve this by using a temporary variable.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20231129161459.1002323-5-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c82c0381
...@@ -704,7 +704,7 @@ static int eqbr_build_groups(struct eqbr_pinctrl_drv_data *drvdata) ...@@ -704,7 +704,7 @@ static int eqbr_build_groups(struct eqbr_pinctrl_drv_data *drvdata)
{ {
struct device *dev = drvdata->dev; struct device *dev = drvdata->dev;
struct device_node *node = dev->of_node; struct device_node *node = dev->of_node;
unsigned int *pinmux, pin_id, pinmux_id; unsigned int *pins, *pinmux, pin_id, pinmux_id;
struct group_desc group; struct group_desc group;
struct device_node *np; struct device_node *np;
struct property *prop; struct property *prop;
...@@ -723,15 +723,14 @@ static int eqbr_build_groups(struct eqbr_pinctrl_drv_data *drvdata) ...@@ -723,15 +723,14 @@ static int eqbr_build_groups(struct eqbr_pinctrl_drv_data *drvdata)
} }
group.num_pins = err; group.num_pins = err;
group.name = prop->value; group.name = prop->value;
group.pins = devm_kcalloc(dev, group.num_pins, pins = devm_kcalloc(dev, group.num_pins, sizeof(*pins), GFP_KERNEL);
sizeof(*(group.pins)), GFP_KERNEL); if (!pins) {
if (!group.pins) {
of_node_put(np); of_node_put(np);
return -ENOMEM; return -ENOMEM;
} }
group.pins = pins;
pinmux = devm_kcalloc(dev, group.num_pins, sizeof(*pinmux), pinmux = devm_kcalloc(dev, group.num_pins, sizeof(*pinmux), GFP_KERNEL);
GFP_KERNEL);
if (!pinmux) { if (!pinmux) {
of_node_put(np); of_node_put(np);
return -ENOMEM; return -ENOMEM;
...@@ -750,7 +749,7 @@ static int eqbr_build_groups(struct eqbr_pinctrl_drv_data *drvdata) ...@@ -750,7 +749,7 @@ static int eqbr_build_groups(struct eqbr_pinctrl_drv_data *drvdata)
of_node_put(np); of_node_put(np);
return -EINVAL; return -EINVAL;
} }
group.pins[j] = pin_id; pins[j] = pin_id;
if (of_property_read_u32_index(np, "pinmux", j, &pinmux_id)) { if (of_property_read_u32_index(np, "pinmux", j, &pinmux_id)) {
dev_err(dev, "Group %s: Read intel pinmux id failed\n", dev_err(dev, "Group %s: Read intel pinmux id failed\n",
group.name); group.name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment