ACPI: configfs: Use sysfs_emit() in "show" functions
PATCH 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
--- drivers/acpi/acpi_configfs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/acpi/acpi_configfs.c +8 -8
@@ -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);
Signature · 1 line
2.30.2
PATCH 2/2 ACPI: configfs: Make get_header() to return error pointer
Instead of duplicating error codes here and there, make get_header() to return error pointer.
--- drivers/acpi/acpi_configfs.c | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/acpi/acpi_configfs.c +19 -19
@@ -70,7 +70,7 @@ static inline struct acpi_table_header *get_header(struct config_item *cfg)if (!table->header)pr_err ("table not loaded\n" ); -return table->header; +return table->header ?:ERR_PTR (-EINVAL ); } static ssize_t acpi_table_aml_read(struct config_item *cfg,
@@ -78,8 +78,8 @@ static ssize_t acpi_table_aml_read(struct config_item *cfg, {struct acpi_table_header *h =get_header (cfg); -if (!h) -return -EINVAL ; +if (IS_ERR (h)) +return PTR_ERR (h);if (data)memcpy (data, h, h->length);
@@ -100,8 +100,8 @@ static ssize_t acpi_table_signature_show(struct config_item *cfg, char *str) {struct acpi_table_header *h =get_header (cfg); -if (!h) -return -EINVAL ; +if (IS_ERR (h)) +return PTR_ERR (h);return sysfs_emit (str,"%.*s\n" ,ACPI_NAMESEG_SIZE , h->signature); }
@@ -110,8 +110,8 @@ static ssize_t acpi_table_length_show(struct config_item *cfg, char *str) {struct acpi_table_header *h =get_header (cfg); -if (!h) -return -EINVAL ; +if (IS_ERR (h)) +return PTR_ERR (h);return sysfs_emit (str,"%d\n" , h->length); }
@@ -120,8 +120,8 @@ static ssize_t acpi_table_revision_show(struct config_item *cfg, char *str) {struct acpi_table_header *h =get_header (cfg); -if (!h) -return -EINVAL ; +if (IS_ERR (h)) +return PTR_ERR (h);return sysfs_emit (str,"%d\n" , h->revision); }
@@ -130,8 +130,8 @@ static ssize_t acpi_table_oem_id_show(struct config_item *cfg, char *str) {struct acpi_table_header *h =get_header (cfg); -if (!h) -return -EINVAL ; +if (IS_ERR (h)) +return PTR_ERR (h);return sysfs_emit (str,"%.*s\n" ,ACPI_OEM_ID_SIZE , h->oem_id); }
@@ -140,8 +140,8 @@ static ssize_t acpi_table_oem_table_id_show(struct config_item *cfg, char *str) {struct acpi_table_header *h =get_header (cfg); -if (!h) -return -EINVAL ; +if (IS_ERR (h)) +return PTR_ERR (h);return sysfs_emit (str,"%.*s\n" ,ACPI_OEM_TABLE_ID_SIZE , h->oem_table_id); }
@@ -150,8 +150,8 @@ static ssize_t acpi_table_oem_revision_show(struct config_item *cfg, char *str) {struct acpi_table_header *h =get_header (cfg); -if (!h) -return -EINVAL ; +if (IS_ERR (h)) +return PTR_ERR (h);return sysfs_emit (str,"%d\n" , h->oem_revision); }
@@ -161,8 +161,8 @@ static ssize_t acpi_table_asl_compiler_id_show(struct config_item *cfg, {struct acpi_table_header *h =get_header (cfg); -if (!h) -return -EINVAL ; +if (IS_ERR (h)) +return PTR_ERR (h);return sysfs_emit (str,"%.*s\n" ,ACPI_NAMESEG_SIZE , h->asl_compiler_id); }
@@ -172,8 +172,8 @@ static ssize_t acpi_table_asl_compiler_revision_show(struct config_item *cfg, {struct acpi_table_header *h =get_header (cfg); -if (!h) -return -EINVAL ; +if (IS_ERR (h)) +return PTR_ERR (h);return sysfs_emit (str,"%d\n" , h->asl_compiler_revision); }
Signature · 1 line
2.30.2
Rafael J. Wysocki
maintainerQuoted 86 lines · Andy Shevchenko
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()tosysfs_emit()accordingly, as the latter is aware of thePAGE_SIZEbuffer and correctly returns the number of bytes written into the buffer.No functional change intended.
[1]
Documentation/filesystems/sysfs.rstSigned-off-by Andy Shevchenko <[email protected]>--- drivers/acpi/acpi_configfs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)drivers/acpi/acpi_configfs.c +7
-7@@ -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,
drivers/acpi/acpi_configfs.c static ssize_t acpi_table_asl_compiler_revision_show(struct config_item *cfg,
Quoted 9 lines
drivers/acpi/acpi_configfs.c +1
-2@@ -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!