2024-04-19 06:43:53

by Yunshui Jiang

Subject: [PATCH v2] platform/x86: samsung-laptop: Use sysfs_emit() to replace the old interface sprintf()

As Documentation/filesystems/sysfs.rst suggested,
show() should only use sysfs_emit() or sysfs_emit_at() when formatting
the value to be returned to user space.

Signed-off-by: yunshui <[email protected]>
Reviewed-by: Ai Chao <[email protected]>
---
drivers/platform/x86/samsung-laptop.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
index b4aa8ba35d2d..3d2f8e758369 100644
--- a/drivers/platform/x86/samsung-laptop.c
+++ b/drivers/platform/x86/samsung-laptop.c
@@ -661,9 +661,9 @@ static ssize_t get_performance_level(struct device *dev,
/* The logic is backwards, yeah, lots of fun... */
for (i = 0; config->performance_levels[i].name; ++i) {
if (sretval.data[0] == config->performance_levels[i].value)
- return sprintf(buf, "%s\n", config->performance_levels[i].name);
+ return sysfs_emit(buf, "%s\n", config->performance_levels[i].name);
}
- return sprintf(buf, "%s\n", "unknown");
+ return sysfs_emit(buf, "%s\n", "unknown");
}

static ssize_t set_performance_level(struct device *dev,
@@ -744,7 +744,7 @@ static ssize_t get_battery_life_extender(struct device *dev,
if (ret < 0)
return ret;

- return sprintf(buf, "%d\n", ret);
+ return sysfs_emit(buf, "%d\n", ret);
}

static ssize_t set_battery_life_extender(struct device *dev,
@@ -813,7 +813,7 @@ static ssize_t get_usb_charge(struct device *dev,
if (ret < 0)
return ret;

- return sprintf(buf, "%d\n", ret);
+ return sysfs_emit(buf, "%d\n", ret);
}

static ssize_t set_usb_charge(struct device *dev,
@@ -878,7 +878,7 @@ static ssize_t get_lid_handling(struct device *dev,
if (ret < 0)
return ret;

- return sprintf(buf, "%d\n", ret);
+ return sysfs_emit(buf, "%d\n", ret);
}

static ssize_t set_lid_handling(struct device *dev,
--
2.34.1

2024-04-22 14:01:43

by Hans de Goede

Subject: Re: [PATCH v2] platform/x86: samsung-laptop: Use sysfs_emit() to replace the old interface sprintf()

Hi,

On 4/19/24 8:41 AM, yunshui wrote:
> As Documentation/filesystems/sysfs.rst suggested,
> show() should only use sysfs_emit() or sysfs_emit_at() when formatting
> the value to be returned to user space.
>
> Signed-off-by: yunshui <[email protected]>
> Reviewed-by: Ai Chao <[email protected]>

Thank you for your patch, I've applied this patch to my review-hans
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.

Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.

Regards,

Hans



> ---
> drivers/platform/x86/samsung-laptop.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
> index b4aa8ba35d2d..3d2f8e758369 100644
> --- a/drivers/platform/x86/samsung-laptop.c
> +++ b/drivers/platform/x86/samsung-laptop.c
> @@ -661,9 +661,9 @@ static ssize_t get_performance_level(struct device *dev,
> /* The logic is backwards, yeah, lots of fun... */
> for (i = 0; config->performance_levels[i].name; ++i) {
> if (sretval.data[0] == config->performance_levels[i].value)
> - return sprintf(buf, "%s\n", config->performance_levels[i].name);
> + return sysfs_emit(buf, "%s\n", config->performance_levels[i].name);
> }
> - return sprintf(buf, "%s\n", "unknown");
> + return sysfs_emit(buf, "%s\n", "unknown");
> }
>
> static ssize_t set_performance_level(struct device *dev,
> @@ -744,7 +744,7 @@ static ssize_t get_battery_life_extender(struct device *dev,
> if (ret < 0)
> return ret;
>
> - return sprintf(buf, "%d\n", ret);
> + return sysfs_emit(buf, "%d\n", ret);
> }
>
> static ssize_t set_battery_life_extender(struct device *dev,
> @@ -813,7 +813,7 @@ static ssize_t get_usb_charge(struct device *dev,
> if (ret < 0)
> return ret;
>
> - return sprintf(buf, "%d\n", ret);
> + return sysfs_emit(buf, "%d\n", ret);
> }
>
> static ssize_t set_usb_charge(struct device *dev,
> @@ -878,7 +878,7 @@ static ssize_t get_lid_handling(struct device *dev,
> if (ret < 0)
> return ret;
>
> - return sprintf(buf, "%d\n", ret);
> + return sysfs_emit(buf, "%d\n", ret);
> }
>
> static ssize_t set_lid_handling(struct device *dev,