Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99e597ad authored by Kees Cook's avatar Kees Cook Committed by Rafael J. Wysocki
Browse files

Back port of "ACPICA: Use designated initializers" 

ACPICA commit 47538f5f0773c0820d8f552e20f6e77104290c01

The following commit is not correctly linuxized by its ACPICA form (see
link #1 for reference):
  Commit: 3d867f6c
  Subject: ACPICA: Use designated initializers
Thus breaks linuxize process.

This patch is a linuxized back port result of the upstreamed ACPICA
commit (see link #2 for reference).

Link: https://github.com/acpica/acpica/pull/248/       [#1]
Link: https://github.com/acpica/acpica/commit/47538f5f

 [#2]
Signed-off-by: default avatarKees Cook <keescook@google.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3ddd3f6a

drivers/acpi/acpica/hwxfsleep.c

+6 −3
Original line number Diff line number Diff line
@@ -72,13 +72,16 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id); 
static struct acpi_sleep_functions acpi_sleep_dispatch[] = {

	{ACPI_STRUCT_INIT(legacy_function,

			  ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep)),

	 ACPI_STRUCT_INIT(extended_function, acpi_hw_extended_sleep) },

	 ACPI_STRUCT_INIT(extended_function,

			  acpi_hw_extended_sleep)},

	{ACPI_STRUCT_INIT(legacy_function,

			  ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep)),

	 ACPI_STRUCT_INIT(extended_function, acpi_hw_extended_wake_prep) },

	 ACPI_STRUCT_INIT(extended_function,

			  acpi_hw_extended_wake_prep)},

	{ACPI_STRUCT_INIT(legacy_function,

			  ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake)),

	 ACPI_STRUCT_INIT(extended_function, acpi_hw_extended_wake) }

	 ACPI_STRUCT_INIT(extended_function,

			  acpi_hw_extended_wake)}

};



/*

include/acpi/platform/acenv.h

+5 −4
Original line number Diff line number Diff line
@@ -288,6 +288,11 @@ 
#define ACPI_INLINE

#endif



/* Use ordered initialization if compiler doesn't support designated. */

#ifndef ACPI_STRUCT_INIT

#define ACPI_STRUCT_INIT(field, value)  value

#endif



/*

 * Configurable calling conventions:

 *
@@ -382,8 +387,4 @@ 
#define ACPI_INIT_FUNCTION

#endif



#ifndef ACPI_STRUCT_INIT

#define ACPI_STRUCT_INIT(field, value) value

#endif



#endif				/* __ACENV_H__ */

include/acpi/platform/aclinux.h

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ 
#define ACPI_MSG_BIOS_ERROR     KERN_ERR "ACPI BIOS Error (bug): "

#define ACPI_MSG_BIOS_WARNING   KERN_WARNING "ACPI BIOS Warning (bug): "



/*

 * Linux wants to use designated initializers for function pointer structs.

 */

#define ACPI_STRUCT_INIT(field, value)	.field = value



#else				/* !__KERNEL__ */