diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2015-05-14 09:31:25 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-05-14 16:16:38 -0400 |
commit | 2bad7e27e02ce0984c17e4074c63e7691291244f (patch) | |
tree | 0791e52696fc804b012515f94001df781e0a30b0 | |
parent | 030bbdbf4c833bc69f502eae58498bc5572db736 (diff) |
ACPI / osl: use same type for acpi_predefined_names values as in definition
In the definition of struct acpi_predefined_names, value is of
type char *. Make the OSL override function also work with type
char * (or, more precisely, with a pointer to it).
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/acpi/osl.c | 2 | ||||
-rw-r--r-- | include/acpi/acpiosxf.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 39748bb3a543..7a327b24df95 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
@@ -543,7 +543,7 @@ static char acpi_os_name[ACPI_MAX_OVERRIDE_LEN]; | |||
543 | 543 | ||
544 | acpi_status | 544 | acpi_status |
545 | acpi_os_predefined_override(const struct acpi_predefined_names *init_val, | 545 | acpi_os_predefined_override(const struct acpi_predefined_names *init_val, |
546 | acpi_string * new_val) | 546 | char **new_val) |
547 | { | 547 | { |
548 | if (!init_val || !new_val) | 548 | if (!init_val || !new_val) |
549 | return AE_BAD_PARAMETER; | 549 | return AE_BAD_PARAMETER; |
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 0bc78df66d4b..d02df0a49d98 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h | |||
@@ -95,7 +95,7 @@ acpi_physical_address acpi_os_get_root_pointer(void); | |||
95 | #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_predefined_override | 95 | #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_predefined_override |
96 | acpi_status | 96 | acpi_status |
97 | acpi_os_predefined_override(const struct acpi_predefined_names *init_val, | 97 | acpi_os_predefined_override(const struct acpi_predefined_names *init_val, |
98 | acpi_string * new_val); | 98 | char **new_val); |
99 | #endif | 99 | #endif |
100 | 100 | ||
101 | #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_table_override | 101 | #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_table_override |