2022-12-08 08:37:01

by ye.xingchen

Subject: [PATCH] platform/x86: sony-laptop: Convert to use sysfs_emit_at() API

From: ye xingchen <[email protected]>

Follow the advice of the Documentation/filesystems/sysfs.rst and show()
should only use sysfs_emit() or sysfs_emit_at() when formatting the
value to be returned to user space.

Signed-off-by: ye xingchen <[email protected]>
---
drivers/platform/x86/sony-laptop.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index a19aac70252f..7156ae2ad196 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -820,10 +820,9 @@ static ssize_t sony_nc_handles_show(struct device *dev,
int i;

for (i = 0; i < ARRAY_SIZE(handles->cap); i++) {
- len += scnprintf(buffer + len, PAGE_SIZE - len, "0x%.4x ",
- handles->cap[i]);
+ len += sysfs_emit_at(buffer, len, "0x%.4x ", handles->cap[i]);
}
- len += scnprintf(buffer + len, PAGE_SIZE - len, "\n");
+ len += sysfs_emit_at(buffer, len, "\n");

return len;
}
@@ -2173,10 +2172,9 @@ static ssize_t sony_nc_thermal_profiles_show(struct device *dev,

for (cnt = 0; cnt < THM_PROFILE_MAX; cnt++) {
if (!cnt || (th_handle->profiles & cnt))
- idx += scnprintf(buffer + idx, PAGE_SIZE - idx, "%s ",
- snc_thermal_profiles[cnt]);
+ idx += sysfs_emit_at(buffer, idx, "%s ", snc_thermal_profiles[cnt]);
}
- idx += scnprintf(buffer + idx, PAGE_SIZE - idx, "\n");
+ idx += sysfs_emit_at(buffer, idx, "\n");

return idx;
}
--
2.25.1

2022-12-08 16:48:34

by Hans de Goede

Subject: Re: [PATCH] platform/x86: sony-laptop: Convert to use sysfs_emit_at() API

Hi,

On 12/8/22 08:45, [email protected] wrote:
> From: ye xingchen <[email protected]>
>
> Follow the advice of the Documentation/filesystems/sysfs.rst and show()
> should only use sysfs_emit() or sysfs_emit_at() when formatting the
> value to be returned to user space.
>
> Signed-off-by: ye xingchen <[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/sony-laptop.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
> index a19aac70252f..7156ae2ad196 100644
> --- a/drivers/platform/x86/sony-laptop.c
> +++ b/drivers/platform/x86/sony-laptop.c
> @@ -820,10 +820,9 @@ static ssize_t sony_nc_handles_show(struct device *dev,
> int i;
>
> for (i = 0; i < ARRAY_SIZE(handles->cap); i++) {
> - len += scnprintf(buffer + len, PAGE_SIZE - len, "0x%.4x ",
> - handles->cap[i]);
> + len += sysfs_emit_at(buffer, len, "0x%.4x ", handles->cap[i]);
> }
> - len += scnprintf(buffer + len, PAGE_SIZE - len, "\n");
> + len += sysfs_emit_at(buffer, len, "\n");
>
> return len;
> }
> @@ -2173,10 +2172,9 @@ static ssize_t sony_nc_thermal_profiles_show(struct device *dev,
>
> for (cnt = 0; cnt < THM_PROFILE_MAX; cnt++) {
> if (!cnt || (th_handle->profiles & cnt))
> - idx += scnprintf(buffer + idx, PAGE_SIZE - idx, "%s ",
> - snc_thermal_profiles[cnt]);
> + idx += sysfs_emit_at(buffer, idx, "%s ", snc_thermal_profiles[cnt]);
> }
> - idx += scnprintf(buffer + idx, PAGE_SIZE - idx, "\n");
> + idx += sysfs_emit_at(buffer, idx, "\n");
>
> return idx;
> }