linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] hwmon: use sysfs_emit() to instead of scnprintf()
@ 2022-12-01  3:30 ye.xingchen
  2022-12-05  3:31 ` Guenter Roeck
  0 siblings, 1 reply; 2+ messages in thread
From: ye.xingchen @ 2022-12-01  3:30 UTC (permalink / raw)
  To: jdelvare; +Cc: linux, guillaume.ligneul, linux-hwmon, linux-kernel

From: ye xingchen <ye.xingchen@zte.com.cn>

Replace the open-code with sysfs_emit() to simplify the code.

Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>
---
 drivers/hwmon/ds1621.c |  2 +-
 drivers/hwmon/lm73.c   |  6 +++---
 drivers/hwmon/sht3x.c  | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 0886abf6ebab..e803d6393b9e 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -269,7 +269,7 @@ static ssize_t update_interval_show(struct device *dev,
 				    struct device_attribute *da, char *buf)
 {
 	struct ds1621_data *data = dev_get_drvdata(dev);
-	return scnprintf(buf, PAGE_SIZE, "%hu\n", data->update_interval);
+	return sysfs_emit(buf, "%hu\n", data->update_interval);
 }

 static ssize_t update_interval_store(struct device *dev,
diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c
index 1346b3b3f463..b6433ae2d75c 100644
--- a/drivers/hwmon/lm73.c
+++ b/drivers/hwmon/lm73.c
@@ -92,7 +92,7 @@ static ssize_t temp_show(struct device *dev, struct device_attribute *da,
 	/* use integer division instead of equivalent right shift to
 	   guarantee arithmetic shift and preserve the sign */
 	temp = (((s16) err) * 250) / 32;
-	return scnprintf(buf, PAGE_SIZE, "%d\n", temp);
+	return sysfs_emit(buf, "%d\n", temp);
 }

 static ssize_t convrate_store(struct device *dev, struct device_attribute *da,
@@ -137,7 +137,7 @@ static ssize_t convrate_show(struct device *dev, struct device_attribute *da,
 	int res;

 	res = (data->ctrl & LM73_CTRL_RES_MASK) >> LM73_CTRL_RES_SHIFT;
-	return scnprintf(buf, PAGE_SIZE, "%hu\n", lm73_convrates[res]);
+	return sysfs_emit(buf, "%hu\n", lm73_convrates[res]);
 }

 static ssize_t maxmin_alarm_show(struct device *dev,
@@ -154,7 +154,7 @@ static ssize_t maxmin_alarm_show(struct device *dev,
 	data->ctrl = ctrl;
 	mutex_unlock(&data->lock);

-	return scnprintf(buf, PAGE_SIZE, "%d\n", (ctrl >> attr->index) & 1);
+	return sysfs_emit(buf, "%d\n", (ctrl >> attr->index) & 1);

 abort:
 	mutex_unlock(&data->lock);
diff --git a/drivers/hwmon/sht3x.c b/drivers/hwmon/sht3x.c
index 3f279aa1cee5..8305e44d9ab2 100644
--- a/drivers/hwmon/sht3x.c
+++ b/drivers/hwmon/sht3x.c
@@ -320,7 +320,7 @@ static ssize_t temp1_limit_show(struct device *dev,
 	u8 index = to_sensor_dev_attr(attr)->index;
 	int temperature_limit = data->temperature_limits[index];

-	return scnprintf(buf, PAGE_SIZE, "%d\n", temperature_limit);
+	return sysfs_emit(buf, "%d\n", temperature_limit);
 }

 static ssize_t humidity1_limit_show(struct device *dev,
@@ -331,7 +331,7 @@ static ssize_t humidity1_limit_show(struct device *dev,
 	u8 index = to_sensor_dev_attr(attr)->index;
 	u32 humidity_limit = data->humidity_limits[index];

-	return scnprintf(buf, PAGE_SIZE, "%u\n", humidity_limit);
+	return sysfs_emit(buf, "%u\n", humidity_limit);
 }

 /*
@@ -483,7 +483,7 @@ static ssize_t temp1_alarm_show(struct device *dev,
 	if (ret)
 		return ret;

-	return scnprintf(buf, PAGE_SIZE, "%d\n", !!(buffer[0] & 0x04));
+	return sysfs_emit(buf, "%d\n", !!(buffer[0] & 0x04));
 }

 static ssize_t humidity1_alarm_show(struct device *dev,
@@ -498,7 +498,7 @@ static ssize_t humidity1_alarm_show(struct device *dev,
 	if (ret)
 		return ret;

-	return scnprintf(buf, PAGE_SIZE, "%d\n", !!(buffer[0] & 0x08));
+	return sysfs_emit(buf, "%d\n", !!(buffer[0] & 0x08));
 }

 static ssize_t heater_enable_show(struct device *dev,
@@ -513,7 +513,7 @@ static ssize_t heater_enable_show(struct device *dev,
 	if (ret)
 		return ret;

-	return scnprintf(buf, PAGE_SIZE, "%d\n", !!(buffer[0] & 0x20));
+	return sysfs_emit(buf, "%d\n", !!(buffer[0] & 0x20));
 }

 static ssize_t heater_enable_store(struct device *dev,
@@ -550,7 +550,7 @@ static ssize_t update_interval_show(struct device *dev,
 {
 	struct sht3x_data *data = dev_get_drvdata(dev);

-	return scnprintf(buf, PAGE_SIZE, "%u\n",
+	return sysfs_emit(buf, "%u\n",
 			 mode_to_update_interval[data->mode]);
 }

-- 
2.25.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] hwmon: use sysfs_emit() to instead of scnprintf()
  2022-12-01  3:30 [PATCH] hwmon: use sysfs_emit() to instead of scnprintf() ye.xingchen
@ 2022-12-05  3:31 ` Guenter Roeck
  0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2022-12-05  3:31 UTC (permalink / raw)
  To: ye.xingchen; +Cc: jdelvare, guillaume.ligneul, linux-hwmon, linux-kernel

On Thu, Dec 01, 2022 at 11:30:31AM +0800, ye.xingchen@zte.com.cn wrote:
> From: ye xingchen <ye.xingchen@zte.com.cn>
> 
> Replace the open-code with sysfs_emit() to simplify the code.
> 
> Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>

Applied to hwmon-next.

Thanks,
Guenter

> ---
>  drivers/hwmon/ds1621.c |  2 +-
>  drivers/hwmon/lm73.c   |  6 +++---
>  drivers/hwmon/sht3x.c  | 12 ++++++------
>  3 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
> index 0886abf6ebab..e803d6393b9e 100644
> --- a/drivers/hwmon/ds1621.c
> +++ b/drivers/hwmon/ds1621.c
> @@ -269,7 +269,7 @@ static ssize_t update_interval_show(struct device *dev,
>  				    struct device_attribute *da, char *buf)
>  {
>  	struct ds1621_data *data = dev_get_drvdata(dev);
> -	return scnprintf(buf, PAGE_SIZE, "%hu\n", data->update_interval);
> +	return sysfs_emit(buf, "%hu\n", data->update_interval);
>  }
> 
>  static ssize_t update_interval_store(struct device *dev,
> diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c
> index 1346b3b3f463..b6433ae2d75c 100644
> --- a/drivers/hwmon/lm73.c
> +++ b/drivers/hwmon/lm73.c
> @@ -92,7 +92,7 @@ static ssize_t temp_show(struct device *dev, struct device_attribute *da,
>  	/* use integer division instead of equivalent right shift to
>  	   guarantee arithmetic shift and preserve the sign */
>  	temp = (((s16) err) * 250) / 32;
> -	return scnprintf(buf, PAGE_SIZE, "%d\n", temp);
> +	return sysfs_emit(buf, "%d\n", temp);
>  }
> 
>  static ssize_t convrate_store(struct device *dev, struct device_attribute *da,
> @@ -137,7 +137,7 @@ static ssize_t convrate_show(struct device *dev, struct device_attribute *da,
>  	int res;
> 
>  	res = (data->ctrl & LM73_CTRL_RES_MASK) >> LM73_CTRL_RES_SHIFT;
> -	return scnprintf(buf, PAGE_SIZE, "%hu\n", lm73_convrates[res]);
> +	return sysfs_emit(buf, "%hu\n", lm73_convrates[res]);
>  }
> 
>  static ssize_t maxmin_alarm_show(struct device *dev,
> @@ -154,7 +154,7 @@ static ssize_t maxmin_alarm_show(struct device *dev,
>  	data->ctrl = ctrl;
>  	mutex_unlock(&data->lock);
> 
> -	return scnprintf(buf, PAGE_SIZE, "%d\n", (ctrl >> attr->index) & 1);
> +	return sysfs_emit(buf, "%d\n", (ctrl >> attr->index) & 1);
> 
>  abort:
>  	mutex_unlock(&data->lock);
> diff --git a/drivers/hwmon/sht3x.c b/drivers/hwmon/sht3x.c
> index 3f279aa1cee5..8305e44d9ab2 100644
> --- a/drivers/hwmon/sht3x.c
> +++ b/drivers/hwmon/sht3x.c
> @@ -320,7 +320,7 @@ static ssize_t temp1_limit_show(struct device *dev,
>  	u8 index = to_sensor_dev_attr(attr)->index;
>  	int temperature_limit = data->temperature_limits[index];
> 
> -	return scnprintf(buf, PAGE_SIZE, "%d\n", temperature_limit);
> +	return sysfs_emit(buf, "%d\n", temperature_limit);
>  }
> 
>  static ssize_t humidity1_limit_show(struct device *dev,
> @@ -331,7 +331,7 @@ static ssize_t humidity1_limit_show(struct device *dev,
>  	u8 index = to_sensor_dev_attr(attr)->index;
>  	u32 humidity_limit = data->humidity_limits[index];
> 
> -	return scnprintf(buf, PAGE_SIZE, "%u\n", humidity_limit);
> +	return sysfs_emit(buf, "%u\n", humidity_limit);
>  }
> 
>  /*
> @@ -483,7 +483,7 @@ static ssize_t temp1_alarm_show(struct device *dev,
>  	if (ret)
>  		return ret;
> 
> -	return scnprintf(buf, PAGE_SIZE, "%d\n", !!(buffer[0] & 0x04));
> +	return sysfs_emit(buf, "%d\n", !!(buffer[0] & 0x04));
>  }
> 
>  static ssize_t humidity1_alarm_show(struct device *dev,
> @@ -498,7 +498,7 @@ static ssize_t humidity1_alarm_show(struct device *dev,
>  	if (ret)
>  		return ret;
> 
> -	return scnprintf(buf, PAGE_SIZE, "%d\n", !!(buffer[0] & 0x08));
> +	return sysfs_emit(buf, "%d\n", !!(buffer[0] & 0x08));
>  }
> 
>  static ssize_t heater_enable_show(struct device *dev,
> @@ -513,7 +513,7 @@ static ssize_t heater_enable_show(struct device *dev,
>  	if (ret)
>  		return ret;
> 
> -	return scnprintf(buf, PAGE_SIZE, "%d\n", !!(buffer[0] & 0x20));
> +	return sysfs_emit(buf, "%d\n", !!(buffer[0] & 0x20));
>  }
> 
>  static ssize_t heater_enable_store(struct device *dev,
> @@ -550,7 +550,7 @@ static ssize_t update_interval_show(struct device *dev,
>  {
>  	struct sht3x_data *data = dev_get_drvdata(dev);
> 
> -	return scnprintf(buf, PAGE_SIZE, "%u\n",
> +	return sysfs_emit(buf, "%u\n",
>  			 mode_to_update_interval[data->mode]);
>  }

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-12-05  3:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-01  3:30 [PATCH] hwmon: use sysfs_emit() to instead of scnprintf() ye.xingchen
2022-12-05  3:31 ` Guenter Roeck

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).