Merge tag 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / acpi / acpi_configfs.c

diff --git a/drivers/acpi/acpi_configfs.c b/drivers/acpi/acpi_configfs.c
index 76b83b1..c970792 100644 (file)
--- a/drivers/acpi/acpi_configfs.c
+++ b/drivers/acpi/acpi_configfs.c
@@ -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,60 +100,60 @@ 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 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)
 {
        struct acpi_table_header *h = get_header(cfg);
 
-       if (!h)
-               return -EINVAL;
+       if (IS_ERR(h))
+               return PTR_ERR(h);
 
-       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)
 {
        struct acpi_table_header *h = get_header(cfg);
 
-       if (!h)
-               return -EINVAL;
+       if (IS_ERR(h))
+               return PTR_ERR(h);
 
-       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)
 {
        struct acpi_table_header *h = get_header(cfg);
 
-       if (!h)
-               return -EINVAL;
+       if (IS_ERR(h))
+               return PTR_ERR(h);
 
-       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)
 {
        struct acpi_table_header *h = get_header(cfg);
 
-       if (!h)
-               return -EINVAL;
+       if (IS_ERR(h))
+               return PTR_ERR(h);
 
-       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)
 {
        struct acpi_table_header *h = get_header(cfg);
 
-       if (!h)
-               return -EINVAL;
+       if (IS_ERR(h))
+               return PTR_ERR(h);
 
-       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,
@@ -161,10 +161,10 @@ 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 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,
@@ -172,10 +172,10 @@ 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 sprintf(str, "%d\n", h->asl_compiler_revision);
+       return sysfs_emit(str, "%d\n", h->asl_compiler_revision);
 }
 
 CONFIGFS_ATTR_RO(acpi_table_, signature);