Skip to contentSkip to conversation

iio: ad5770r: make devicetree property reading consistent

PATCH Applied Nuno Sá 3 participants 3 messages Aug 18, 2021 – Aug 29, 2021

Subsystems (2)
lore
Share & tools
lore

Nuno Sá

author maintainer
#0 lore raw

PATCH v2 1/1 iio: ad5770r: make devicetree property reading consistent

The bindings file for this driver is defining the property as 'reg' but the driver was reading it with the 'num' name. The bindings actually had the 'num' property when added in
commit ea52c21268e6 ("dt-bindings: iio: dac: Add docs for AD5770R DAC") and then changed it to 'reg' in
commit 2cf3818f18b2 ("dt-bindings: iio: dac: AD5570R fix bindings errors"). However, both these commits landed in v5.7 so the assumption is that either 'num' is not being used or if it is, the validations were not done.

Anyways, if someone comes back yelling about this, we might just support both of the properties in the future. Not ideal, but that's life...

Fixes 2cf3818f18b2 ("dt-bindings: iio: dac: AD5570R fix bindings errors")

---
v2:
* Updated the commit description and added a fixes tag.

 drivers/iio/dac/ad5770r.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ad5770r.c +1 -1
index 8107f7bbbe3c..7e2fd32e993a 100644
@@ -522,7 +522,7 @@ static int ad5770r_channel_config(struct ad5770r_state *st)
 		return -EINVAL;
 
 	device_for_each_child_node(&st->spi->dev, child) {
-		ret = fwnode_property_read_u32(child, "num", &num);
+		ret = fwnode_property_read_u32(child, "reg", &num);
 		if (ret)
 			goto err_child_out;
 		if (num >= AD5770R_MAX_CHANNELS) {
Signature · 1 line
2.32.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 11 lines · Nuno Sá

The bindings file for this driver is defining the property as 'reg' but the driver was reading it with the 'num' name. The bindings actually had the 'num' property when added in
commit ea52c21268e6 ("dt-bindings: iio: dac: Add docs for AD5770R DAC") and then changed it to 'reg' in
commit 2cf3818f18b2 ("dt-bindings: iio: dac: AD5570R fix bindings errors"). However, both these commits landed in v5.7 so the assumption is that either 'num' is not being used or if it is, the validations were not done.

Quoted 2 lines

Anyways, if someone comes back yelling about this, we might just support both of the properties in the future. Not ideal, but that's life...

Quoted 25 lines
Fixes 2cf3818f18b2 ("dt-bindings: iio: dac: AD5570R fix bindings errors")

---
v2:
* Updated the commit description and added a fixes tag.

 drivers/iio/dac/ad5770r.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ad5770r.c +1 -2
index 8107f7bbbe3c..7e2fd32e993a 100644
@@ -522,7 +522,7 @@ static int ad5770r_channel_config(struct ad5770r_state *st)
                return -EINVAL;
 
        device_for_each_child_node(&st->spi->dev, child) {
-               ret = fwnode_property_read_u32(child, "num", &num);
+               ret = fwnode_property_read_u32(child, "reg", &num);
                if (ret)
                        goto err_child_out;
                if (num >= AD5770R_MAX_CHANNELS) {
--

2.32.0

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer Applied
#2 lore raw
Quoted 12 lines · On Wed, 18 Aug 2021 12:54:09 +0300 Andy Shevchenko <[email protected]>…
Quoted 11 lines · Nuno Sá

The bindings file for this driver is defining the property as 'reg' but the driver was reading it with the 'num' name. The bindings actually had the 'num' property when added in
commit ea52c21268e6 ("dt-bindings: iio: dac: Add docs for AD5770R DAC") and then changed it to 'reg' in
commit 2cf3818f18b2 ("dt-bindings: iio: dac: AD5570R fix bindings errors"). However, both these commits landed in v5.7 so the assumption is that either 'num' is not being used or if it is, the validations were not done.

Quoted 4 lines
Quoted 2 lines

Anyways, if someone comes back yelling about this, we might just support both of the properties in the future. Not ideal, but that's life...

Given the potential issues on this I want it to sit in next for a while. As such I'm applying it via the slow path rather than the quick one. It'll sit in next for most of a cycle before the merge window in 3 months time.

Hopefully anyone who has fallen in the gap is doing tests! (seems unlikely but they can't claim we didn't give them time to notice ;)

Applied to the togreg branch of iio.git and marked for stable.

Thanks,

Jonathan

Quoted 28 lines
Quoted 26 lines
Fixes 2cf3818f18b2 ("dt-bindings: iio: dac: AD5570R fix bindings errors")

---
v2:
* Updated the commit description and added a fixes tag.

 drivers/iio/dac/ad5770r.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ad5770r.c +1 -2
index 8107f7bbbe3c..7e2fd32e993a 100644
@@ -522,7 +522,7 @@ static int ad5770r_channel_config(struct ad5770r_state *st)
                return -EINVAL;
 
        device_for_each_child_node(&st->spi->dev, child) {
-               ret = fwnode_property_read_u32(child, "num", &num);
+               ret = fwnode_property_read_u32(child, "reg", &num);
                if (ret)
                        goto err_child_out;
                if (num >= AD5770R_MAX_CHANNELS) {
--

2.32.0