Skip to contentSkip to conversation

iio: chemical: atlas-ph-sensor: use regmap_bulk_read

PATCH In review Matt Ranostay 2 participants 2 messages Feb 15, 2016 – Feb 21, 2016 IIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: chemical: atlas-ph-sensor: use regmap_bulk_read

Replaced i2c_smbus_read_i2c_block_data() with regmap_bulk_read() function call. This is to make the driver code more consistent.

---
 drivers/iio/chemical/atlas-ph-sensor.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/chemical/atlas-ph-sensor.c +3 -3
index 06cd49c..93fcea9 100644
@@ -180,10 +180,10 @@ static irqreturn_t atlas_trigger_handler(int irq, void *private)
 	struct atlas_data *data = iio_priv(indio_dev);
 	int ret;
 
-	ret = i2c_smbus_read_i2c_block_data(data->client, ATLAS_REG_PH_DATA,
-				sizeof(data->buffer[0]), (u8 *) &data->buffer);
+	ret = regmap_bulk_read(data->regmap, ATLAS_REG_PH_DATA,
+			      (u8 *) &data->buffer, sizeof(data->buffer[0]));
 
-	if (ret > 0)
+	if (!ret)
 		iio_push_to_buffers_with_timestamp(indio_dev, data->buffer,
 				iio_get_time_ns());
 
Signature · 1 line
2.7.0
maintainer
#1 lore raw
Quoted 4 lines · Matt Ranostay

Replaced i2c_smbus_read_i2c_block_data() with regmap_bulk_read() function call. This is to make the driver code more consistent.

Oops.
Applied, thanks,

Jonathan

Quoted 23 lines
---
 drivers/iio/chemical/atlas-ph-sensor.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/chemical/atlas-ph-sensor.c +3 -3
index 06cd49c..93fcea9 100644
@@ -180,10 +180,10 @@ static irqreturn_t atlas_trigger_handler(int irq, void *private)
 	struct atlas_data *data = iio_priv(indio_dev);
 	int ret;
 
-	ret = i2c_smbus_read_i2c_block_data(data->client, ATLAS_REG_PH_DATA,
-				sizeof(data->buffer[0]), (u8 *) &data->buffer);
+	ret = regmap_bulk_read(data->regmap, ATLAS_REG_PH_DATA,
+			      (u8 *) &data->buffer, sizeof(data->buffer[0]));
 
-	if (ret > 0)
+	if (!ret)
 		iio_push_to_buffers_with_timestamp(indio_dev, data->buffer,
 				iio_get_time_ns());