From: Pantelis Antoniou
The changeset helpers are easier to use, use them instead of
using the static property.
Signed-off-by: Pantelis Antoniou
Acked-by: Wolfram Sang
["okay" -> "ok"]
Signed-off-by: Laurent Pinchart
---
drivers/i2c/muxes/i2c-demux-pinctrl.c | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c
b/drivers/i2c/muxes/i2c-demux-pinctrl.c
index 33ce032cb701..0f0046831492 100644
--- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
@@ -220,10 +220,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device
*pdev)
priv = devm_kzalloc(>dev, sizeof(*priv)
+ num_chan * sizeof(struct i2c_demux_pinctrl_chan),
GFP_KERNEL);
-
- props = devm_kcalloc(>dev, num_chan, sizeof(*props), GFP_KERNEL);
-
- if (!priv || !props)
+ if (!priv)
return -ENOMEM;
err = of_property_read_string(np, "i2c-bus-name", >bus_name);
@@ -241,12 +238,9 @@ static int i2c_demux_pinctrl_probe(struct platform_device
*pdev)
}
priv->chan[i].parent_np = adap_np;
- props[i].name = devm_kstrdup(>dev, "status", GFP_KERNEL);
- props[i].value = devm_kstrdup(>dev, "ok", GFP_KERNEL);
- props[i].length = 3;
-
of_changeset_init(>chan[i].chgset);
- of_changeset_update_property(>chan[i].chgset, adap_np,
[i]);
+ of_changeset_update_property_string(>chan[i].chgset,
+ adap_np, "status", "ok");
}
priv->num_chan = num_chan;
--
Regards,
Laurent Pinchart
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel