Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ACPI: configfs: Make get_header() to return error pointer

Browse Source 
Instead of duplicating error codes here and there,
make get_header() to return error pointer.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Andy Shevchenko 2021-07-15 17:16:51 +03:00 committed by Rafael J. Wysocki
parent ae57338716
commit 45c16fe1d1
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/acpi/acpi_configfs.c
View File

@ -70,7 +70,7 @@ static inline struct acpi_table_header *get_header(struct config_item *cfg)
if (!table->header) if (!table->header)
pr_err("table not loaded\n"); 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, 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); struct acpi_table_header *h = get_header(cfg);
if (!h) if (IS_ERR(h))
return -EINVAL; return PTR_ERR(h);
if (data) if (data)
memcpy(data, h, h->length); 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); struct acpi_table_header *h = get_header(cfg);
if (!h) if (IS_ERR(h))
return -EINVAL; return PTR_ERR(h);
return sysfs_emit(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->signature); 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); struct acpi_table_header *h = get_header(cfg);
if (!h) if (IS_ERR(h))
return -EINVAL; return PTR_ERR(h);
return sysfs_emit(str, "%d\n", h->length); 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); struct acpi_table_header *h = get_header(cfg);
if (!h) if (IS_ERR(h))
return -EINVAL; return PTR_ERR(h);
return sysfs_emit(str, "%d\n", h->revision); 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); struct acpi_table_header *h = get_header(cfg);
if (!h) if (IS_ERR(h))
return -EINVAL; return PTR_ERR(h);
return sysfs_emit(str, "%.*s\n", ACPI_OEM_ID_SIZE, h->oem_id); 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); struct acpi_table_header *h = get_header(cfg);
if (!h) if (IS_ERR(h))
return -EINVAL; return PTR_ERR(h);
return sysfs_emit(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);
} }
@ -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); struct acpi_table_header *h = get_header(cfg);
if (!h) if (IS_ERR(h))
return -EINVAL; return PTR_ERR(h);
return sysfs_emit(str, "%d\n", h->oem_revision); 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); struct acpi_table_header *h = get_header(cfg);
if (!h) if (IS_ERR(h))
return -EINVAL; return PTR_ERR(h);
return sysfs_emit(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->asl_compiler_id); 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); struct acpi_table_header *h = get_header(cfg);
if (!h) if (IS_ERR(h))
return -EINVAL; return PTR_ERR(h);
return sysfs_emit(str, "%d\n", h->asl_compiler_revision); return sysfs_emit(str, "%d\n", h->asl_compiler_revision);
} }