Commit 4f1094ba authored by George Guo's avatar George Guo Committed by Rafael J. Wysocki
Browse files

ACPICA: Modify ACPI_STATE_COMMON 

ACPICA commit 0a43d3521582b5234f69e8bb535e83325387525a

Avoid trailing semicolons in macro, and it's not readable to put macro ACPI_STATE_COMMON and other
variables in the same line.
So modify the macro and just put it in a single line.

Link: https://github.com/acpica/acpica/commit/0a43d352


Signed-off-by: default avatarGeorge Guo <guodongtai@kylinos.cn>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 7c94858e

drivers/acpi/acpica/aclocal.h

+19 −11
Original line number Diff line number Diff line
@@ -560,25 +560,28 @@ struct acpi_field_info { 
	u8                              descriptor_type; /* To differentiate various internal objs */\

	u8                              flags; \

	u16                             value; \

	u16                             state;

	u16                             state



	/* There are 2 bytes available here until the next natural alignment boundary */



struct acpi_common_state {

ACPI_STATE_COMMON};

	ACPI_STATE_COMMON;

};



/*

 * Update state - used to traverse complex objects such as packages

 */

struct acpi_update_state {

	ACPI_STATE_COMMON union acpi_operand_object *object;

	ACPI_STATE_COMMON;

	union acpi_operand_object *object;

};



/*

 * Pkg state - used to traverse nested package structures

 */

struct acpi_pkg_state {

	ACPI_STATE_COMMON u32 index;

	ACPI_STATE_COMMON;

	u32 index;

	union acpi_operand_object *source_object;

	union acpi_operand_object *dest_object;

	struct acpi_walk_state *walk_state;
@@ -591,7 +594,8 @@ struct acpi_pkg_state { 
 * Allows nesting of these constructs

 */

struct acpi_control_state {

	ACPI_STATE_COMMON u16 opcode;

	ACPI_STATE_COMMON;

	u16 opcode;

	union acpi_parse_object *predicate_op;

	u8 *aml_predicate_start;	/* Start of if/while predicate */

	u8 *package_end;	/* End of if/while block */
@@ -602,11 +606,13 @@ struct acpi_control_state { 
 * Scope state - current scope during namespace lookups

 */

struct acpi_scope_state {

	ACPI_STATE_COMMON struct acpi_namespace_node *node;

	ACPI_STATE_COMMON;

	struct acpi_namespace_node *node;

};



struct acpi_pscope_state {

	ACPI_STATE_COMMON u32 arg_count;	/* Number of fixed arguments */

	ACPI_STATE_COMMON;

	u32 arg_count;		/* Number of fixed arguments */

	union acpi_parse_object *op;	/* Current op being parsed */

	u8 *arg_end;		/* Current argument end */

	u8 *pkg_end;		/* Current package end */
@@ -618,7 +624,8 @@ struct acpi_pscope_state { 
 * states are created when there are nested control methods executing.

 */

struct acpi_thread_state {

	ACPI_STATE_COMMON u8 current_sync_level;	/* Mutex Sync (nested acquire) level */

	ACPI_STATE_COMMON;

	u8 current_sync_level;	/* Mutex Sync (nested acquire) level */

	struct acpi_walk_state *walk_state_list;	/* Head of list of walk_states for this thread */

	union acpi_operand_object *acquired_mutex_list;	/* List of all currently acquired mutexes */

	acpi_thread_id thread_id;	/* Running thread ID */
@@ -629,7 +636,7 @@ struct acpi_thread_state { 
 * AML arguments

 */

struct acpi_result_values {

	ACPI_STATE_COMMON

	ACPI_STATE_COMMON;

	union acpi_operand_object *obj_desc[ACPI_RESULTS_FRAME_OBJ_NUM];

};
@@ -652,7 +659,8 @@ struct acpi_global_notify_handler { 
 * handler/dispatcher.

 */

struct acpi_notify_info {

	ACPI_STATE_COMMON u8 handler_list_id;

	ACPI_STATE_COMMON;

	u8 handler_list_id;

	struct acpi_namespace_node *node;

	union acpi_operand_object *handler_list_head;

	struct acpi_global_notify_handler *global;