ACPICA: linuxize: cleanup typedef definitions (7679c35d) · Commits · 戴 / test

ACPICA commit 894e49ef22db354eb1685cdb6f5f991766351d3c acpisrc now has capability to convert both the followings: 1. Form 1: typedef struct/union foo { struct/union foo { .... --> ... } FOO; } 2. Form 2: typedef struct/union foo FOO; --> typedef struct/union foo foo; It becomes unable to handle the following: 3. Form3: typedef struct/union foo { /* comment */ ... } FOO; --> strut/union foo { /* comment */ ... }; As: 1. The purpose of acpisrc is to convert formatted code (ACPICA coding style) into linux coding style, 2. acpisrc is a very simple tool that doesn't fully handle C language. This commit changes the definitions side in order not to regress and we shall make "no comments in struct/union line" as a new ACPICA coding style rule. Lv Zheng. Link: https://github.com/acpica/acpica/commit/894e49ef Signed-off-by:

Lv Zheng <lv.zheng@intel.com> Signed-off-by:

Bob Moore <robert.moore@intel.com> Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

drivers/acpi/acpica/acobject.h

+9 −3

Original line number	Diff line number	Diff line
		@@ -122,7 +122,9 @@ struct acpi_object_integer {
		_type *pointer; \
		u32 length;

		struct acpi_object_string { /* Null terminated, ASCII characters only */
		/* Null terminated, ASCII characters only */

		struct acpi_object_string {
		ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_BUFFER_INFO(char) /* String in AML stream or allocated string */
		};

		@@ -211,7 +213,9 @@ struct acpi_object_method {
		union acpi_operand_object notify_list[2]; / Handlers for system/device notifies */\
		union acpi_operand_object handler; / Handler for Address space */

		struct acpi_object_notify_common { /* COMMON NOTIFY for POWER, PROCESSOR, DEVICE, and THERMAL */
		/* COMMON NOTIFY for POWER, PROCESSOR, DEVICE, and THERMAL */

		struct acpi_object_notify_common {
		ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_NOTIFY_INFO};

		struct acpi_object_device {
		@@ -258,7 +262,9 @@ ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_NOTIFY_INFO};
		u8 access_length; /* For serial regions/fields */


		struct acpi_object_field_common { /* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */
		/* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */

		struct acpi_object_field_common {
		ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO union acpi_operand_object region_obj; / Parent Operation Region object (REGION/BANK fields only) */
		};

Admin message