aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2016-01-14 19:17:11 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-15 16:22:05 -0500
commitc11e5dd3eadf3abcddcc509605eb24c20c03fc6d (patch)
tree33fc968b55022b979fe62c7aad03dbc2a6710659 /drivers/acpi/acpica
parentc8100dc4643d80a94f074dfc8a2af3d3d327b7aa (diff)
ACPICA: Silence a -Wbad-function-cast warning when acpi_uintptr_t is 'uintptr_t'
Do not pass the return value of strtoul() to the ACPI_TO_POINTER() macro to avoid a -Wbad-function-cast warning. Signed-off-by: Sascha Wildner <saw@online.de> Signed-off-by: Lv Zheng <lv.zheng@intel.com> [ rjw: Changelog ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica')
-rw-r--r--drivers/acpi/acpica/dbdisply.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/dbdisply.c b/drivers/acpi/acpica/dbdisply.c
index f10c158424f3..502bb587f112 100644
--- a/drivers/acpi/acpica/dbdisply.c
+++ b/drivers/acpi/acpica/dbdisply.c
@@ -599,12 +599,14 @@ void acpi_db_display_calling_tree(void)
599 599
600void acpi_db_display_object_type(char *object_arg) 600void acpi_db_display_object_type(char *object_arg)
601{ 601{
602 acpi_size arg;
602 acpi_handle handle; 603 acpi_handle handle;
603 struct acpi_device_info *info; 604 struct acpi_device_info *info;
604 acpi_status status; 605 acpi_status status;
605 u32 i; 606 u32 i;
606 607
607 handle = ACPI_TO_POINTER(strtoul(object_arg, NULL, 16)); 608 arg = strtoul(object_arg, NULL, 16);
609 handle = ACPI_TO_POINTER(arg);
608 610
609 status = acpi_get_object_info(handle, &info); 611 status = acpi_get_object_info(handle, &info);
610 if (ACPI_FAILURE(status)) { 612 if (ACPI_FAILURE(status)) {