]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
platform/x86: Avoid -Wflex-array-member-not-at-end warning
authorGustavo A. R. Silva <gustavoars@kernel.org>
Thu, 27 Mar 2025 19:22:44 +0000 (13:22 -0600)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 7 Apr 2025 10:13:58 +0000 (13:13 +0300)
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are
getting ready to enable it, globally.

Move the conflicting declaration to the end of the structure. Notice
that `struct acpi_resource_irq` is a flexible structure --a structure
that contains a flexible-array member.

Fix the following warning:

drivers/platform/x86/sony-laptop.c:3330:41: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/Z-WlhL_tAP11M02G@kspp
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/sony-laptop.c

index b52390fbd7434d888798326e33000eb3c5a63e94..9144a51920f1fa794f17cbc882609b3a4db6b796 100644 (file)
@@ -3327,8 +3327,10 @@ struct sony_pic_ioport {
 };
 
 struct sony_pic_irq {
-       struct acpi_resource_irq        irq;
        struct list_head                list;
+
+       /* Must be last --ends in a flexible-array member. */
+       struct acpi_resource_irq        irq;
 };
 
 struct sonypi_eventtypes {