Skip to contentSkip to conversation

iio: light: tsl2563 change of_property_read to device_property_read

PATCH Superseded Vaishnav M A 2 participants 5 messages Oct 18, 2020 IIO

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 iio: light: tsl2563 change of_property_read to device_property_read

replace the of_property_read_u32 for reading the amstaos,cover-comp-gain property with device_property_read_u32,allows the driver to get the properties information using the more generic device_property_* helpers and opens the possibility of passing the properties during platform instantiation of the device by a suitably populated struct property_entry.

---
v2:
- fix commit message

 drivers/iio/light/tsl2563.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/iio/light/tsl2563.c +7 -7
index abc8d7db8dc1..1f1b8b7cefa4 100644
@@ -703,7 +703,6 @@ static int tsl2563_probe(struct i2c_client *client,
 	struct iio_dev *indio_dev;
 	struct tsl2563_chip *chip;
 	struct tsl2563_platform_data *pdata = client->dev.platform_data;
-	struct device_node *np = client->dev.of_node;
 	int err = 0;
 	u8 id = 0;
 
@@ -738,13 +737,14 @@ static int tsl2563_probe(struct i2c_client *client,
 	chip->calib0 = tsl2563_calib_from_sysfs(CALIB_BASE_SYSFS);
 	chip->calib1 = tsl2563_calib_from_sysfs(CALIB_BASE_SYSFS);
 
-	if (pdata)
+	if (pdata) {
 		chip->cover_comp_gain = pdata->cover_comp_gain;
-	else if (np)
-		of_property_read_u32(np, "amstaos,cover-comp-gain",
-				     &chip->cover_comp_gain);
-	else
-		chip->cover_comp_gain = 1;
+	} else {
+		err = device_property_read_u32(&client->dev, "amstaos,cover-comp-gain",
+					       &chip->cover_comp_gain);
+		if (err)
+			chip->cover_comp_gain = 1;
+	}
 
 	dev_info(&client->dev, "model %d, rev. %d\n", id >> 4, id & 0x0f);
 	indio_dev->name = client->name;
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 8 lines · On Sun, 18 Oct 2020 08:55:43 +0530 Vaishnav M A <[email protected]>…

replace the of_property_read_u32 for reading the amstaos,cover-comp-gain property with device_property_read_u32,allows the driver to get the properties information using the more generic device_property_* helpers and opens the possibility of passing the properties during platform instantiation of the device by a suitably populated struct property_entry.

See review for v1. Most of it still applies, I just hadn't realised you'd sent a v2. As I mentioned on one of your other patches, if you send a v2 without any comments on v1, please reply yourself to say you have done so. Otherwise, people may well review the wrong version.

Thanks,

Jonathan

Quoted 39 lines

---
v2:
- fix commit message

 drivers/iio/light/tsl2563.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/iio/light/tsl2563.c +7 -7
index abc8d7db8dc1..1f1b8b7cefa4 100644
@@ -703,7 +703,6 @@ static int tsl2563_probe(struct i2c_client *client,
 	struct iio_dev *indio_dev;
 	struct tsl2563_chip *chip;
 	struct tsl2563_platform_data *pdata = client->dev.platform_data;
-	struct device_node *np = client->dev.of_node;
 	int err = 0;
 	u8 id = 0;
 
@@ -738,13 +737,14 @@ static int tsl2563_probe(struct i2c_client *client,
 	chip->calib0 = tsl2563_calib_from_sysfs(CALIB_BASE_SYSFS);
 	chip->calib1 = tsl2563_calib_from_sysfs(CALIB_BASE_SYSFS);
 
-	if (pdata)
+	if (pdata) {
 		chip->cover_comp_gain = pdata->cover_comp_gain;
-	else if (np)
-		of_property_read_u32(np, "amstaos,cover-comp-gain",
-				     &chip->cover_comp_gain);
-	else
-		chip->cover_comp_gain = 1;
+	} else {
+		err = device_property_read_u32(&client->dev, "amstaos,cover-comp-gain",
+					       &chip->cover_comp_gain);
+		if (err)
+			chip->cover_comp_gain = 1;
+	}
 
 	dev_info(&client->dev, "model %d, rev. %d\n", id >> 4, id & 0x0f);
 	indio_dev->name = client->name;
maintainer
#2 lore raw
In reply to Vaishnav M A
Quoted 8 lines · On Sun, 18 Oct 2020 08:55:43 +0530 Vaishnav M A <[email protected]>…

replace the of_property_read_u32 for reading the amstaos,cover-comp-gain property with device_property_read_u32,allows the driver to get the properties information using the more generic device_property_* helpers and opens the possibility of passing the properties during platform instantiation of the device by a suitably populated struct property_entry.

Please tidy up that description in a similar fashion to I've suggested in other reviews. Code looks fine.

On another day I might have just fixed that description whilst applying but we have lots of time at this point in the cycle, hence I'm bouncing them back to you ;)

Thanks,

Jonathan

Quoted 39 lines

---
v2:
- fix commit message

 drivers/iio/light/tsl2563.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/iio/light/tsl2563.c +7 -7
index abc8d7db8dc1..1f1b8b7cefa4 100644
@@ -703,7 +703,6 @@ static int tsl2563_probe(struct i2c_client *client,
 	struct iio_dev *indio_dev;
 	struct tsl2563_chip *chip;
 	struct tsl2563_platform_data *pdata = client->dev.platform_data;
-	struct device_node *np = client->dev.of_node;
 	int err = 0;
 	u8 id = 0;
 
@@ -738,13 +737,14 @@ static int tsl2563_probe(struct i2c_client *client,
 	chip->calib0 = tsl2563_calib_from_sysfs(CALIB_BASE_SYSFS);
 	chip->calib1 = tsl2563_calib_from_sysfs(CALIB_BASE_SYSFS);
 
-	if (pdata)
+	if (pdata) {
 		chip->cover_comp_gain = pdata->cover_comp_gain;
-	else if (np)
-		of_property_read_u32(np, "amstaos,cover-comp-gain",
-				     &chip->cover_comp_gain);
-	else
-		chip->cover_comp_gain = 1;
+	} else {
+		err = device_property_read_u32(&client->dev, "amstaos,cover-comp-gain",
+					       &chip->cover_comp_gain);
+		if (err)
+			chip->cover_comp_gain = 1;
+	}
 
 	dev_info(&client->dev, "model %d, rev. %d\n", id >> 4, id & 0x0f);
 	indio_dev->name = client->name;
#3 lore raw
Quoted 15 lines · Jonathan Cameron
Quoted 8 lines · On Sun, 18 Oct 2020 08:55:43 +0530 Vaishnav M A <[email protected]>…

replace the of_property_read_u32 for reading the amstaos,cover-comp-gain property with device_property_read_u32,allows the driver to get the properties information using the more generic device_property_* helpers and opens the possibility of passing the properties during platform instantiation of the device by a suitably populated struct property_entry.

Please tidy up that description in a similar fashion to I've suggested in other reviews. Code looks fine.

Quoted 8 lines

On another day I might have just fixed that description whilst applying but we have lots of time at this point in the cycle, hence I'm bouncing them back to you ;)

Thanks,

Jonathan

Thank you Jonathan for the review, sorry about missing to notify after sending the v2 patch(and repeating the same mistake a few times), will make sure that it won't happen again. I have sent a v3 patch updated with all the suggested changes : https://lore.kernel.org/patchwork/patch/1322194/

Thanks and Regards,
Vaishnav

Quoted 40 lines
Quoted 39 lines

---
v2:
- fix commit message

 drivers/iio/light/tsl2563.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/iio/light/tsl2563.c +7 -7
index abc8d7db8dc1..1f1b8b7cefa4 100644
@@ -703,7 +703,6 @@ static int tsl2563_probe(struct i2c_client *client,
      struct iio_dev *indio_dev;
      struct tsl2563_chip *chip;
      struct tsl2563_platform_data *pdata = client->dev.platform_data;
-     struct device_node *np = client->dev.of_node;
      int err = 0;
      u8 id = 0;
 
@@ -738,13 +737,14 @@ static int tsl2563_probe(struct i2c_client *client,
      chip->calib0 = tsl2563_calib_from_sysfs(CALIB_BASE_SYSFS);
      chip->calib1 = tsl2563_calib_from_sysfs(CALIB_BASE_SYSFS);
 
-     if (pdata)
+     if (pdata) {
              chip->cover_comp_gain = pdata->cover_comp_gain;
-     else if (np)
-             of_property_read_u32(np, "amstaos,cover-comp-gain",
-                                  &chip->cover_comp_gain);
-     else
-             chip->cover_comp_gain = 1;
+     } else {
+             err = device_property_read_u32(&client->dev, "amstaos,cover-comp-gain",
+                                            &chip->cover_comp_gain);
+             if (err)
+                     chip->cover_comp_gain = 1;
+     }
 
      dev_info(&client->dev, "model %d, rev. %d\n", id >> 4, id & 0x0f);
      indio_dev->name = client->name;
#4 lore raw
Quoted 25 lines · Vaishnav M A
Quoted 15 lines · Jonathan Cameron
Quoted 8 lines · On Sun, 18 Oct 2020 08:55:43 +0530 Vaishnav M A <[email protected]>…

replace the of_property_read_u32 for reading the amstaos,cover-comp-gain property with device_property_read_u32,allows the driver to get the properties information using the more generic device_property_* helpers and opens the possibility of passing the properties during platform instantiation of the device by a suitably populated struct property_entry.

Please tidy up that description in a similar fashion to I've suggested in other reviews. Code looks fine.

Quoted 8 lines

On another day I might have just fixed that description whilst applying but we have lots of time at this point in the cycle, hence I'm bouncing them back to you ;)

Thanks,

Jonathan

Quoted 7 lines

Thank you Jonathan for the review, sorry about missing to notify after sending the v2 patch(and repeating the same mistake a few times), will make sure that it won't happen again. I have sent a v3 patch updated with all the suggested changes : https://lore.kernel.org/patchwork/patch/1322194/

Thanks and Regards,
Vaishnav

Updated v4 patch submitted considering comments from Andy Shevchenko on a different patch to refer to the functions like function() and updated the commit title to a shorter one, similar to one used for similar changes within the subsystem, like in 00fa493b9989 ("iio:proximity:as3935: Drop of_match_ptr and use generic fw accessors")
https://lore.kernel.org/patchwork/patch/1322221/

Quoted 40 lines
Quoted 40 lines
Quoted 39 lines

---
v2:
- fix commit message

 drivers/iio/light/tsl2563.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/iio/light/tsl2563.c +7 -7
index abc8d7db8dc1..1f1b8b7cefa4 100644
@@ -703,7 +703,6 @@ static int tsl2563_probe(struct i2c_client *client,
      struct iio_dev *indio_dev;
      struct tsl2563_chip *chip;
      struct tsl2563_platform_data *pdata = client->dev.platform_data;
-     struct device_node *np = client->dev.of_node;
      int err = 0;
      u8 id = 0;
 
@@ -738,13 +737,14 @@ static int tsl2563_probe(struct i2c_client *client,
      chip->calib0 = tsl2563_calib_from_sysfs(CALIB_BASE_SYSFS);
      chip->calib1 = tsl2563_calib_from_sysfs(CALIB_BASE_SYSFS);
 
-     if (pdata)
+     if (pdata) {
              chip->cover_comp_gain = pdata->cover_comp_gain;
-     else if (np)
-             of_property_read_u32(np, "amstaos,cover-comp-gain",
-                                  &chip->cover_comp_gain);
-     else
-             chip->cover_comp_gain = 1;
+     } else {
+             err = device_property_read_u32(&client->dev, "amstaos,cover-comp-gain",
+                                            &chip->cover_comp_gain);
+             if (err)
+                     chip->cover_comp_gain = 1;
+     }
 
      dev_info(&client->dev, "model %d, rev. %d\n", id >> 4, id & 0x0f);
      indio_dev->name = client->name;