diff options
author | Bob Moore <robert.moore@intel.com> | 2016-05-05 00:58:25 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-05 09:22:26 -0400 |
commit | 5391abfdae7fc61556af4dd115e7522985fc9998 (patch) | |
tree | 19024d949128e6db7a4f4476bbb1dc506fbb67cf | |
parent | 14f98579095af5697564276159e07aee1379582d (diff) |
ACPICA: Renamed some #defined flag constants for clarity
ACPICA commit 438905b205e64e742f9670a0970419c426264831
Expanded a couple of cryptic names.
Link: https://github.com/acpica/acpica/commit/438905b2
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>
-rw-r--r-- | drivers/acpi/acpica/aclocal.h | 30 | ||||
-rw-r--r-- | drivers/acpi/acpica/psutils.c | 2 |
2 files changed, 16 insertions, 16 deletions
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index 166a67fb271d..13331d70dea0 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h | |||
@@ -856,24 +856,24 @@ struct acpi_parse_state { | |||
856 | 856 | ||
857 | /* Parse object flags */ | 857 | /* Parse object flags */ |
858 | 858 | ||
859 | #define ACPI_PARSEOP_GENERIC 0x01 | 859 | #define ACPI_PARSEOP_GENERIC 0x01 |
860 | #define ACPI_PARSEOP_NAMED 0x02 | 860 | #define ACPI_PARSEOP_NAMED_OBJECT 0x02 |
861 | #define ACPI_PARSEOP_DEFERRED 0x04 | 861 | #define ACPI_PARSEOP_DEFERRED 0x04 |
862 | #define ACPI_PARSEOP_BYTELIST 0x08 | 862 | #define ACPI_PARSEOP_BYTELIST 0x08 |
863 | #define ACPI_PARSEOP_IN_STACK 0x10 | 863 | #define ACPI_PARSEOP_IN_STACK 0x10 |
864 | #define ACPI_PARSEOP_TARGET 0x20 | 864 | #define ACPI_PARSEOP_TARGET 0x20 |
865 | #define ACPI_PARSEOP_IN_CACHE 0x80 | 865 | #define ACPI_PARSEOP_IN_CACHE 0x80 |
866 | 866 | ||
867 | /* Parse object disasm_flags */ | 867 | /* Parse object disasm_flags */ |
868 | 868 | ||
869 | #define ACPI_PARSEOP_IGNORE 0x01 | 869 | #define ACPI_PARSEOP_IGNORE 0x01 |
870 | #define ACPI_PARSEOP_PARAMLIST 0x02 | 870 | #define ACPI_PARSEOP_PARAMETER_LIST 0x02 |
871 | #define ACPI_PARSEOP_EMPTY_TERMLIST 0x04 | 871 | #define ACPI_PARSEOP_EMPTY_TERMLIST 0x04 |
872 | #define ACPI_PARSEOP_PREDEF_CHECKED 0x08 | 872 | #define ACPI_PARSEOP_PREDEFINED_CHECKED 0x08 |
873 | #define ACPI_PARSEOP_CLOSING_PAREN 0x10 | 873 | #define ACPI_PARSEOP_CLOSING_PAREN 0x10 |
874 | #define ACPI_PARSEOP_COMPOUND 0x20 | 874 | #define ACPI_PARSEOP_COMPOUND_ASSIGNMENT 0x20 |
875 | #define ACPI_PARSEOP_ASSIGNMENT 0x40 | 875 | #define ACPI_PARSEOP_ASSIGNMENT 0x40 |
876 | #define ACPI_PARSEOP_ELSEIF 0x80 | 876 | #define ACPI_PARSEOP_ELSEIF 0x80 |
877 | 877 | ||
878 | /***************************************************************************** | 878 | /***************************************************************************** |
879 | * | 879 | * |
diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c index b28b0da171b6..89cb4bffcc7c 100644 --- a/drivers/acpi/acpica/psutils.c +++ b/drivers/acpi/acpica/psutils.c | |||
@@ -128,7 +128,7 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode, u8 *aml) | |||
128 | if (op_info->flags & AML_DEFER) { | 128 | if (op_info->flags & AML_DEFER) { |
129 | flags = ACPI_PARSEOP_DEFERRED; | 129 | flags = ACPI_PARSEOP_DEFERRED; |
130 | } else if (op_info->flags & AML_NAMED) { | 130 | } else if (op_info->flags & AML_NAMED) { |
131 | flags = ACPI_PARSEOP_NAMED; | 131 | flags = ACPI_PARSEOP_NAMED_OBJECT; |
132 | } else if (opcode == AML_INT_BYTELIST_OP) { | 132 | } else if (opcode == AML_INT_BYTELIST_OP) { |
133 | flags = ACPI_PARSEOP_BYTELIST; | 133 | flags = ACPI_PARSEOP_BYTELIST; |
134 | } | 134 | } |