aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/dsutils.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-12-21 10:03:16 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-12-21 10:03:16 +0100
commit1027fb0fb94aaaaa36ad58193fc61c36efaced85 (patch)
tree10808022e183c1618e36c4eb7a203877d32fc214 /drivers/acpi/acpica/dsutils.c
parent28586a51eea666d5531bcaef2f68e4abbd87242c (diff)
parent3b15e830ba59ae20a52b401e8f9e981bd21ab577 (diff)
downloadkernel_replicant_linux-1027fb0fb94aaaaa36ad58193fc61c36efaced85.tar.gz
kernel_replicant_linux-1027fb0fb94aaaaa36ad58193fc61c36efaced85.tar.bz2
kernel_replicant_linux-1027fb0fb94aaaaa36ad58193fc61c36efaced85.zip
Merge branch 'acpica'
* acpica: ACPICA: Update version to 20181213 ACPICA: change coding style to match ACPICA, no functional change ACPICA: Debug output: Add option to display method/object evaluation ACPICA: disassembler: disassemble OEMx tables as AML ACPICA: Add "Windows 2018.2" string in the _OSI support ACPICA: Expressions in package elements are not supported ACPICA: Update buffer-to-string conversions ACPICA: add comments, no functional change ACPICA: Remove defines that use deprecated flag ACPICA: Add "Windows 2018" string in the _OSI support ACPICA: Update version to 20181031 ACPICA: iASL: Enhance error detection ACPICA: iASL: adding definition and disassembly for TPM2 revision 3 ACPICA: Use %d for signed int print formatting instead of %u ACPICA: Debugger: refactor to fix unused variable warning
Diffstat (limited to 'drivers/acpi/acpica/dsutils.c')
-rw-r--r--drivers/acpi/acpica/dsutils.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index 8d1b75400515..fb9ed5e1da89 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -57,7 +57,6 @@ void acpi_ds_clear_implicit_return(struct acpi_walk_state *walk_state)
}
}
-#ifndef ACPI_NO_METHOD_EXECUTION
/*******************************************************************************
*
* FUNCTION: acpi_ds_do_implicit_return
@@ -401,7 +400,6 @@ void acpi_ds_clear_operands(struct acpi_walk_state *walk_state)
walk_state->num_operands = 0;
return_VOID;
}
-#endif
/*******************************************************************************
*