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: 3d867f6c5fd6535cdeceef3170e5e84e5dd80fc1
  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/
Link: https://github.com/acpica/acpica/commit/47538f5f
Signed-off-by: Kees Cook <keescook@google.com>
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>

diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
index 7ef13934968f3d56d2e76cba94ec5424cfdaaa3c..e5c095ca6083a9a91169b65e986f73a3efc7d8fa 100644 (file)
--- a/drivers/acpi/acpica/hwxfsleep.c
+++ b/drivers/acpi/acpica/hwxfsleep.c
@@ -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)}
 };
 
 /*

diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
index 912563c66948e48568e90f618bf1b8872e3342f6..043fd559de6ed6fe16b0eef8feacec40e637a8c6 100644 (file)
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
@@ -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__ */

diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 047f13865608e246bad8dea81f45a4826f05357d..afd95f28c8f00dd884778da245786076ce96c236 100644 (file)
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -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__ */