2021-07-15 16:47:21

by Andy Shevchenko

Subject: [PATCH v1 1/2] ACPI: configfs: Use sysfs_emit() in "show" functions

The sysfs_emit() function was introduced to make it less ambiguous
which function is preferred when writing to the output buffer in
a "show" callback [1].

Convert the GPIO library sysfs interface from sprintf() to sysfs_emit()
accordingly, as the latter is aware of the PAGE_SIZE buffer and correctly
returns the number of bytes written into the buffer.

No functional change intended.

[1] Documentation/filesystems/sysfs.rst

Signed-off-by: Andy Shevchenko <[email protected]>
---
drivers/acpi/acpi_configfs.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/acpi/acpi_configfs.c b/drivers/acpi/acpi_configfs.c
index 76b83b181356..6e6ef8a1f447 100644
--- a/drivers/acpi/acpi_configfs.c
+++ b/drivers/acpi/acpi_configfs.c
@@ -103,7 +103,7 @@ static ssize_t acpi_table_signature_show(struct config_item *cfg, char *str)
if (!h)
return -EINVAL;

- return sprintf(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->signature);
+ return sysfs_emit(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->signature);
}

static ssize_t acpi_table_length_show(struct config_item *cfg, char *str)
@@ -113,7 +113,7 @@ static ssize_t acpi_table_length_show(struct config_item *cfg, char *str)
if (!h)
return -EINVAL;

- return sprintf(str, "%d\n", h->length);
+ return sysfs_emit(str, "%d\n", h->length);
}

static ssize_t acpi_table_revision_show(struct config_item *cfg, char *str)
@@ -123,7 +123,7 @@ static ssize_t acpi_table_revision_show(struct config_item *cfg, char *str)
if (!h)
return -EINVAL;

- return sprintf(str, "%d\n", h->revision);
+ return sysfs_emit(str, "%d\n", h->revision);
}

static ssize_t acpi_table_oem_id_show(struct config_item *cfg, char *str)
@@ -133,7 +133,7 @@ static ssize_t acpi_table_oem_id_show(struct config_item *cfg, char *str)
if (!h)
return -EINVAL;

- return sprintf(str, "%.*s\n", ACPI_OEM_ID_SIZE, h->oem_id);
+ return sysfs_emit(str, "%.*s\n", ACPI_OEM_ID_SIZE, h->oem_id);
}

static ssize_t acpi_table_oem_table_id_show(struct config_item *cfg, char *str)
@@ -143,7 +143,7 @@ static ssize_t acpi_table_oem_table_id_show(struct config_item *cfg, char *str)
if (!h)
return -EINVAL;

- return sprintf(str, "%.*s\n", ACPI_OEM_TABLE_ID_SIZE, h->oem_table_id);
+ return sysfs_emit(str, "%.*s\n", ACPI_OEM_TABLE_ID_SIZE, h->oem_table_id);
}

static ssize_t acpi_table_oem_revision_show(struct config_item *cfg, char *str)
@@ -153,7 +153,7 @@ static ssize_t acpi_table_oem_revision_show(struct config_item *cfg, char *str)
if (!h)
return -EINVAL;

- return sprintf(str, "%d\n", h->oem_revision);
+ return sysfs_emit(str, "%d\n", h->oem_revision);
}

static ssize_t acpi_table_asl_compiler_id_show(struct config_item *cfg,
@@ -164,7 +164,7 @@ static ssize_t acpi_table_asl_compiler_id_show(struct config_item *cfg,
if (!h)
return -EINVAL;

- return sprintf(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->asl_compiler_id);
+ return sysfs_emit(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->asl_compiler_id);
}

static ssize_t acpi_table_asl_compiler_revision_show(struct config_item *cfg,
@@ -175,7 +175,7 @@ static ssize_t acpi_table_asl_compiler_revision_show(struct config_item *cfg,
if (!h)
return -EINVAL;

- return sprintf(str, "%d\n", h->asl_compiler_revision);
+ return sysfs_emit(str, "%d\n", h->asl_compiler_revision);
}

CONFIGFS_ATTR_RO(acpi_table_, signature);
--
2.30.2

2021-07-16 17:30:58

by Rafael J. Wysocki

Subject: Re: [PATCH v1 1/2] ACPI: configfs: Use sysfs_emit() in "show" functions

On Thu, Jul 15, 2021 at 4:16 PM Andy Shevchenko
<[email protected]> wrote:
>
> The sysfs_emit() function was introduced to make it less ambiguous
> which function is preferred when writing to the output buffer in
> a "show" callback [1].
>
> Convert the GPIO library sysfs interface from sprintf() to sysfs_emit()
> accordingly, as the latter is aware of the PAGE_SIZE buffer and correctly
> returns the number of bytes written into the buffer.
>
> No functional change intended.
>
> [1] Documentation/filesystems/sysfs.rst
>
> Signed-off-by: Andy Shevchenko <[email protected]>
> ---
> drivers/acpi/acpi_configfs.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/acpi/acpi_configfs.c b/drivers/acpi/acpi_configfs.c
> index 76b83b181356..6e6ef8a1f447 100644
> --- a/drivers/acpi/acpi_configfs.c
> +++ b/drivers/acpi/acpi_configfs.c
> @@ -103,7 +103,7 @@ static ssize_t acpi_table_signature_show(struct config_item *cfg, char *str)
> if (!h)
> return -EINVAL;
>
> - return sprintf(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->signature);
> + return sysfs_emit(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->signature);
> }
>
> static ssize_t acpi_table_length_show(struct config_item *cfg, char *str)
> @@ -113,7 +113,7 @@ static ssize_t acpi_table_length_show(struct config_item *cfg, char *str)
> if (!h)
> return -EINVAL;
>
> - return sprintf(str, "%d\n", h->length);
> + return sysfs_emit(str, "%d\n", h->length);
> }
>
> static ssize_t acpi_table_revision_show(struct config_item *cfg, char *str)
> @@ -123,7 +123,7 @@ static ssize_t acpi_table_revision_show(struct config_item *cfg, char *str)
> if (!h)
> return -EINVAL;
>
> - return sprintf(str, "%d\n", h->revision);
> + return sysfs_emit(str, "%d\n", h->revision);
> }
>
> static ssize_t acpi_table_oem_id_show(struct config_item *cfg, char *str)
> @@ -133,7 +133,7 @@ static ssize_t acpi_table_oem_id_show(struct config_item *cfg, char *str)
> if (!h)
> return -EINVAL;
>
> - return sprintf(str, "%.*s\n", ACPI_OEM_ID_SIZE, h->oem_id);
> + return sysfs_emit(str, "%.*s\n", ACPI_OEM_ID_SIZE, h->oem_id);
> }
>
> static ssize_t acpi_table_oem_table_id_show(struct config_item *cfg, char *str)
> @@ -143,7 +143,7 @@ static ssize_t acpi_table_oem_table_id_show(struct config_item *cfg, char *str)
> if (!h)
> return -EINVAL;
>
> - return sprintf(str, "%.*s\n", ACPI_OEM_TABLE_ID_SIZE, h->oem_table_id);
> + return sysfs_emit(str, "%.*s\n", ACPI_OEM_TABLE_ID_SIZE, h->oem_table_id);
> }
>
> static ssize_t acpi_table_oem_revision_show(struct config_item *cfg, char *str)
> @@ -153,7 +153,7 @@ static ssize_t acpi_table_oem_revision_show(struct config_item *cfg, char *str)
> if (!h)
> return -EINVAL;
>
> - return sprintf(str, "%d\n", h->oem_revision);
> + return sysfs_emit(str, "%d\n", h->oem_revision);
> }
>
> static ssize_t acpi_table_asl_compiler_id_show(struct config_item *cfg,
> @@ -164,7 +164,7 @@ static ssize_t acpi_table_asl_compiler_id_show(struct config_item *cfg,
> if (!h)
> return -EINVAL;
>
> - return sprintf(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->asl_compiler_id);
> + return sysfs_emit(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->asl_compiler_id);
> }
>
> static ssize_t acpi_table_asl_compiler_revision_show(struct config_item *cfg,
> @@ -175,7 +175,7 @@ static ssize_t acpi_table_asl_compiler_revision_show(struct config_item *cfg,
> if (!h)
> return -EINVAL;
>
> - return sprintf(str, "%d\n", h->asl_compiler_revision);
> + return sysfs_emit(str, "%d\n", h->asl_compiler_revision);
> }
>
> CONFIGFS_ATTR_RO(acpi_table_, signature);
> --

Applied along with the [2/2[ as 5.15 material, thanks!