Skip to contentSkip to conversation

iio: proximity: srf08: Replace sprintf() with sysfs_emit()

PATCH Superseded Maxwell Doose 2 participants 2 messages Apr 21 – Apr 22

Subsystems (2)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 iio: proximity: srf08: Replace sprintf() with sysfs_emit()

Replace sprintf() function calls with sysfs_emit() and sysfs_emit_at(). While the current code is fine, sysfs_emit() is preferred over sprintf(), and will help modernize the driver.

---
v2:
- Fixed indenting of sysfs_emit call in function srf08_show_range_mm.
- Optimized return sequence in function srf08_show_sensitivity by directly returning instead of modifying a variable and then returning.

v3:
- Changed indenting of sysfs_emit() call in function srf08_show_range_mm() per Andy Shevchenko's request.
- Clarified commit message details.

v4:
- Changed sysfs_emit() call in function srf08_show_range() to be on one line to resolve issues around indentation alignment.
- Clarified commit message details again.

 drivers/iio/proximity/srf08.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/iio/proximity/srf08.c +5 -9
index d7e4cc48cfbf..78b67fbca825 100644
@@ -226,7 +226,7 @@ static int srf08_read_raw(struct iio_dev *indio_dev,
 static ssize_t srf08_show_range_mm_available(struct device *dev,
 				struct device_attribute *attr, char *buf)
 {
-	return sprintf(buf, "[0.043 0.043 11.008]\n");
+	return sysfs_emit(buf, "[0.043 0.043 11.008]\n");
 }
 
 static IIO_DEVICE_ATTR(sensor_max_range_available, S_IRUGO,
@@ -238,8 +238,7 @@ static ssize_t srf08_show_range_mm(struct device *dev,
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 	struct srf08_data *data = iio_priv(indio_dev);
 
-	return sprintf(buf, "%d.%03d\n", data->range_mm / 1000,
-						data->range_mm % 1000);
+	return sysfs_emit(buf, "%d.%03d\n", data->range_mm / 1000, data->range_mm % 1000);
 }
 
 /*
@@ -316,10 +315,10 @@ static ssize_t srf08_show_sensitivity_available(struct device *dev,
 
 	for (i = 0; i < data->chip_info->num_sensitivity_avail; i++)
 		if (data->chip_info->sensitivity_avail[i])
-			len += sprintf(buf + len, "%d ",
+			len += sysfs_emit_at(buf, len, "%d ",
 				data->chip_info->sensitivity_avail[i]);
 
-	len += sprintf(buf + len, "\n");
+	len += sysfs_emit_at(buf, len, "\n");
 
 	return len;
 }
@@ -332,11 +331,8 @@ static ssize_t srf08_show_sensitivity(struct device *dev,
 {
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 	struct srf08_data *data = iio_priv(indio_dev);
-	int len;
 
-	len = sprintf(buf, "%d\n", data->sensitivity);
-
-	return len;
+	return sysfs_emit(buf, "%d\n", data->sensitivity);
 }
 
 static ssize_t srf08_write_sensitivity(struct srf08_data *data,
Signature · 1 line
2.53.0
#1 lore raw
Quoted 3 lines · Maxwell Doose

Replace sprintf() function calls with sysfs_emit() and sysfs_emit_at(). While the current code is fine, sysfs_emit() is preferred over sprintf(), and will help modernize the driver.

...

Quoted 3 lines

- Changed sysfs_emit() call in function srf08_show_range() to be on one line to resolve issues around indentation alignment.

Wrong. We assume 80 character limits unless this makes readability suffer.

...

drivers/iio/proximity/srf08.c static ssize_t srf08_show_sensitivity_available(struct device *dev, · line 319

Quoted 5 lines
drivers/iio/proximity/srf08.c +1 -1
 	for (i = 0; i < data->chip_info->num_sensitivity_avail; i++)
 		if (data->chip_info->sensitivity_avail[i])
-			len += sprintf(buf + len, "%d ",
+			len += sysfs_emit_at(buf, len, "%d ",
 				data->chip_info->sensitivity_avail[i]);

Still the same issue as per v3.

Signature · 2 lines
With Best Regards,
Andy Shevchenko