Skip to content

Commit 5391abf

Browse files
acpibobrafaeljw
authored andcommitted
ACPICA: Renamed some #defined flag constants for clarity
ACPICA commit 438905b205e64e742f9670a0970419c426264831 Expanded a couple of cryptic names. Link: acpica/acpica@438905b2 Signed-off-by: Bob Moore <[email protected]> Signed-off-by: Lv Zheng <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 14f9857 commit 5391abf

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

drivers/acpi/acpica/aclocal.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -856,24 +856,24 @@ struct acpi_parse_state {
856856

857857
/* Parse object flags */
858858

859-
#define ACPI_PARSEOP_GENERIC 0x01
860-
#define ACPI_PARSEOP_NAMED 0x02
861-
#define ACPI_PARSEOP_DEFERRED 0x04
862-
#define ACPI_PARSEOP_BYTELIST 0x08
863-
#define ACPI_PARSEOP_IN_STACK 0x10
864-
#define ACPI_PARSEOP_TARGET 0x20
865-
#define ACPI_PARSEOP_IN_CACHE 0x80
859+
#define ACPI_PARSEOP_GENERIC 0x01
860+
#define ACPI_PARSEOP_NAMED_OBJECT 0x02
861+
#define ACPI_PARSEOP_DEFERRED 0x04
862+
#define ACPI_PARSEOP_BYTELIST 0x08
863+
#define ACPI_PARSEOP_IN_STACK 0x10
864+
#define ACPI_PARSEOP_TARGET 0x20
865+
#define ACPI_PARSEOP_IN_CACHE 0x80
866866

867867
/* Parse object disasm_flags */
868868

869-
#define ACPI_PARSEOP_IGNORE 0x01
870-
#define ACPI_PARSEOP_PARAMLIST 0x02
871-
#define ACPI_PARSEOP_EMPTY_TERMLIST 0x04
872-
#define ACPI_PARSEOP_PREDEF_CHECKED 0x08
873-
#define ACPI_PARSEOP_CLOSING_PAREN 0x10
874-
#define ACPI_PARSEOP_COMPOUND 0x20
875-
#define ACPI_PARSEOP_ASSIGNMENT 0x40
876-
#define ACPI_PARSEOP_ELSEIF 0x80
869+
#define ACPI_PARSEOP_IGNORE 0x01
870+
#define ACPI_PARSEOP_PARAMETER_LIST 0x02
871+
#define ACPI_PARSEOP_EMPTY_TERMLIST 0x04
872+
#define ACPI_PARSEOP_PREDEFINED_CHECKED 0x08
873+
#define ACPI_PARSEOP_CLOSING_PAREN 0x10
874+
#define ACPI_PARSEOP_COMPOUND_ASSIGNMENT 0x20
875+
#define ACPI_PARSEOP_ASSIGNMENT 0x40
876+
#define ACPI_PARSEOP_ELSEIF 0x80
877877

878878
/*****************************************************************************
879879
*

drivers/acpi/acpica/psutils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode, u8 *aml)
128128
if (op_info->flags & AML_DEFER) {
129129
flags = ACPI_PARSEOP_DEFERRED;
130130
} else if (op_info->flags & AML_NAMED) {
131-
flags = ACPI_PARSEOP_NAMED;
131+
flags = ACPI_PARSEOP_NAMED_OBJECT;
132132
} else if (opcode == AML_INT_BYTELIST_OP) {
133133
flags = ACPI_PARSEOP_BYTELIST;
134134
}

0 commit comments

Comments
 (0)