summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2016-01-15 03:17:11 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-16 00:22:05 +0300
commitc11e5dd3eadf3abcddcc509605eb24c20c03fc6d (patch)
tree33fc968b55022b979fe62c7aad03dbc2a6710659 /drivers/acpi
parentc8100dc4643d80a94f074dfc8a2af3d3d327b7aa (diff)
downloadlinux-c11e5dd3eadf3abcddcc509605eb24c20c03fc6d.tar.xz
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')
-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)
void acpi_db_display_object_type(char *object_arg)
{
+ acpi_size arg;
acpi_handle handle;
struct acpi_device_info *info;
acpi_status status;
u32 i;
- handle = ACPI_TO_POINTER(strtoul(object_arg, NULL, 16));
+ arg = strtoul(object_arg, NULL, 16);
+ handle = ACPI_TO_POINTER(arg);
status = acpi_get_object_info(handle, &info);
if (ACPI_FAILURE(status)) {