summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortangchen <tangchen@cn.fujitsu.com>2014-01-06 12:47:59 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-06 15:33:06 +0400
commitf8a571b2a128a1697624c1b132f3af07848ebbcf (patch)
tree44bcc1ce0fd54c134cc50e1af205d0d1d8cfe8be
parentde2d1a7e9310c4d1464faf469c737f08b5608600 (diff)
downloadlinux-f8a571b2a128a1697624c1b132f3af07848ebbcf.tar.xz
ACPI / tables: Return proper error codes from acpi_table_parse() and fix comment.
The comment about return value of acpi_table_parse() is incorrect. This patch fix it. Since all callers only check if the function succeeded or not, this patch simplifies the semantics by returning -errno for all failure cases. This will also simply the comment. As suggested by Toshi Kani <toshi.kani@hp.com>, also change the stub in linux/acpi.h to return -ENODEV. Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/tables.c5
-rw-r--r--include/linux/acpi.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index a17619bfb57b..5837f857ac2e 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -278,12 +278,13 @@ acpi_table_parse_madt(enum acpi_madt_type id,
/**
* acpi_table_parse - find table with @id, run @handler on it
- *
* @id: table id to find
* @handler: handler to run
*
* Scan the ACPI System Descriptor Table (STD) for a table matching @id,
- * run @handler on it. Return 0 if table found, return on if not.
+ * run @handler on it.
+ *
+ * Return 0 if table found, -errno if not.
*/
int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
{
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 726a6aa62b64..7aaf7315d33d 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -461,7 +461,7 @@ struct acpi_table_header;
static inline int acpi_table_parse(char *id,
int (*handler)(struct acpi_table_header *))
{
- return -1;
+ return -ENODEV;
}
static inline int acpi_nvs_register(__u64 start, __u64 size)