| Message ID | 20240314084753.1322110-1-lizhijian@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/4] HID: hid-picolcd_core: Convert sprintf/snprintf to sysfs_emit | expand |
On 14/03/2024 23:33, Jonathan Cameron wrote: > On Thu, 14 Mar 2024 16:47:51 +0800 > Li Zhijian <lizhijian@fujitsu.com> wrote: > >> Per filesystems/sysfs.rst, show() should only use sysfs_emit() >> or sysfs_emit_at() when formatting the value to be returned to user space. >> >> coccinelle complains that there are still a couple of functions that use >> snprintf(). Convert them to sysfs_emit(). >> >> sprintf() will be converted as weel if they have. >> >> Generally, this patch is generated by >> make coccicheck M=<path/to/file> MODE=patch \ >> COCCI=scripts/coccinelle/api/device_attr_show.cocci >> >> No functional change intended >> >> CC: Jiri Kosina <jikos@kernel.org> >> CC: Jonathan Cameron <jic23@kernel.org> >> CC: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> >> CC: Benjamin Tissoires <benjamin.tissoires@redhat.com> >> CC: linux-input@vger.kernel.org >> CC: linux-iio@vger.kernel.org >> Signed-off-by: Li Zhijian <lizhijian@fujitsu.com> > Hi Li Zhijian, > > One trivial comment inline. > Otherwise straight forward so > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > >> --- >> This is a part of the work "Fix coccicheck device_attr_show warnings"[1] >> Split them per subsystem so that the maintainer can review it easily >> [1] https://lore.kernel.org/lkml/20240116041129.3937800-1-lizhijian@fujitsu.com/ >> --- >> drivers/hid/hid-sensor-custom.c | 10 +++++----- >> 1 file changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c >> index d85398721659..ee1a118834f0 100644 >> --- a/drivers/hid/hid-sensor-custom.c >> +++ b/drivers/hid/hid-sensor-custom.c >> @@ -155,7 +155,7 @@ static ssize_t enable_sensor_show(struct device *dev, >> { >> struct hid_sensor_custom *sensor_inst = dev_get_drvdata(dev); >> >> - return sprintf(buf, "%d\n", sensor_inst->enable); >> + return sysfs_emit(buf, "%d\n", sensor_inst->enable); >> } >> >> static int set_power_report_state(struct hid_sensor_custom *sensor_inst, >> @@ -372,14 +372,14 @@ static ssize_t show_value(struct device *dev, struct device_attribute *attr, >> sizeof(struct hid_custom_usage_desc), >> usage_id_cmp); >> if (usage_desc) >> - return snprintf(buf, PAGE_SIZE, "%s\n", >> - usage_desc->desc); >> + return sysfs_emit(buf, "%s\n", >> + usage_desc->desc); > rewrap the line as will be under 80 chars. Good catch, i will update it. Thanks Zhijian > >> else >> - return sprintf(buf, "not-specified\n"); >> + return sysfs_emit(buf, "not-specified\n"); >> } else >> return -EINVAL; >> >> - return sprintf(buf, "%d\n", value); >> + return sysfs_emit(buf, "%d\n", value); >> } >> >> static ssize_t store_value(struct device *dev, struct device_attribute *attr, >
diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c index bbda231a7ce3..fa46fb6eab3f 100644 --- a/drivers/hid/hid-picolcd_core.c +++ b/drivers/hid/hid-picolcd_core.c @@ -256,9 +256,9 @@ static ssize_t picolcd_operation_mode_show(struct device *dev, struct picolcd_data *data = dev_get_drvdata(dev); if (data->status & PICOLCD_BOOTLOADER) - return snprintf(buf, PAGE_SIZE, "[bootloader] lcd\n"); + return sysfs_emit(buf, "[bootloader] lcd\n"); else - return snprintf(buf, PAGE_SIZE, "bootloader [lcd]\n"); + return sysfs_emit(buf, "bootloader [lcd]\n"); } static ssize_t picolcd_operation_mode_store(struct device *dev, @@ -301,7 +301,7 @@ static ssize_t picolcd_operation_mode_delay_show(struct device *dev, { struct picolcd_data *data = dev_get_drvdata(dev); - return snprintf(buf, PAGE_SIZE, "%hu\n", data->opmode_delay); + return sysfs_emit(buf, "%hu\n", data->opmode_delay); } static ssize_t picolcd_operation_mode_delay_store(struct device *dev,
Per filesystems/sysfs.rst, show() should only use sysfs_emit() or sysfs_emit_at() when formatting the value to be returned to user space. coccinelle complains that there are still a couple of functions that use snprintf(). Convert them to sysfs_emit(). sprintf() will be converted as weel if they have. Generally, this patch is generated by make coccicheck M=<path/to/file> MODE=patch \ COCCI=scripts/coccinelle/api/device_attr_show.cocci No functional change intended CC: "Bruno Prémont" <bonbons@linux-vserver.org> CC: Jiri Kosina <jikos@kernel.org> CC: Benjamin Tissoires <benjamin.tissoires@redhat.com> CC: linux-input@vger.kernel.org Signed-off-by: Li Zhijian <lizhijian@fujitsu.com> --- This is a part of the work "Fix coccicheck device_attr_show warnings"[1] Split them per subsystem so that the maintainer can review it easily [1] https://lore.kernel.org/lkml/20240116041129.3937800-1-lizhijian@fujitsu.com/ --- drivers/hid/hid-picolcd_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)