summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/dbutils.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2016-03-24 02:40:40 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-05 03:53:33 +0200
commit0dfaaa3d51df011c16279bb010bff90f45b6d62c (patch)
tree5be91b3ae3e0878bd8eaf3f2ec4c9837e1879990 /drivers/acpi/acpica/dbutils.c
parentACPICA: Utilities: Update for strtoul64 merger (diff)
downloadlinux-0dfaaa3d51df011c16279bb010bff90f45b6d62c.tar.xz
linux-0dfaaa3d51df011c16279bb010bff90f45b6d62c.zip
ACPICA: All: const keyword changes across the ACPICA source
ACPICA commit a240cbb93647bddf525b3daf6e9d31b8b9bca34e Integrated most changes proposed by net_BSD. >From joerg@net_BSD.org (Joerg Sonnenberger) ACPICA BZ 732. Link: https://github.com/acpica/acpica/commit/a240cbb9 Link: https://bugs.acpica.org/show_bug.cgi?id=732 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/dbutils.c')
-rw-r--r--drivers/acpi/acpica/dbutils.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/dbutils.c b/drivers/acpi/acpica/dbutils.c
index b37a2c77b86b..ae80106d1000 100644
--- a/drivers/acpi/acpica/dbutils.c
+++ b/drivers/acpi/acpica/dbutils.c
@@ -56,8 +56,6 @@ acpi_status acpi_db_second_pass_parse(union acpi_parse_object *root);
void acpi_db_dump_buffer(u32 address);
#endif
-static char *gbl_hex_to_ascii = "0123456789ABCDEF";
-
/*******************************************************************************
*
* FUNCTION: acpi_db_match_argument
@@ -82,8 +80,9 @@ acpi_db_match_argument(char *user_argument,
}
for (i = 0; arguments[i].name; i++) {
- if (strstr(arguments[i].name, user_argument) ==
- arguments[i].name) {
+ if (strstr(ACPI_CAST_PTR(char, arguments[i].name),
+ ACPI_CAST_PTR(char,
+ user_argument)) == arguments[i].name) {
return (i);
}
}
@@ -339,7 +338,7 @@ void acpi_db_uint32_to_hex_string(u32 value, char *buffer)
buffer[8] = '\0';
for (i = 7; i >= 0; i--) {
- buffer[i] = gbl_hex_to_ascii[value & 0x0F];
+ buffer[i] = acpi_gbl_upper_hex_digits[value & 0x0F];
value = value >> 4;
}
}