summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/exstore.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2017-04-26 11:18:40 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-04-27 01:31:00 +0300
commit9ff5a21a50301ef16aeb2e3937867de7eb0af030 (patch)
tree0d118587bd0ca6817aa591c16e538aaf96f60e6a /drivers/acpi/acpica/exstore.c
parent069f9bf454a61d6fafa415dc2a8713938196d650 (diff)
downloadlinux-9ff5a21a50301ef16aeb2e3937867de7eb0af030.tar.xz
ACPICA: Cleanup AML opcode definitions, no functional change
ACPICA commit ec969d38fef3be95358e65f0dd071b5f2c045b6b This change is a cleanup and further standardization of the AML opcode defines in amlcode.h Improves the readability and maintainability of the source code. Link: https://github.com/acpica/acpica/commit/ec969d38 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/exstore.c')
-rw-r--r--drivers/acpi/acpica/exstore.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index a2f8001aeb86..bdd43cde8f36 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -416,7 +416,7 @@ acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,
/* Only limited target types possible for everything except copy_object */
- if (walk_state->opcode != AML_COPY_OP) {
+ if (walk_state->opcode != AML_COPY_OBJECT_OP) {
/*
* Only copy_object allows all object types to be overwritten. For
* target_ref(s), there are restrictions on the object types that
@@ -499,7 +499,8 @@ acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,
case ACPI_TYPE_STRING:
case ACPI_TYPE_BUFFER:
- if ((walk_state->opcode == AML_COPY_OP) || !implicit_conversion) {
+ if ((walk_state->opcode == AML_COPY_OBJECT_OP) ||
+ !implicit_conversion) {
/*
* However, copy_object and Stores to arg_x do not perform
* an implicit conversion, as per the ACPI specification.