drm/nouveau/conn: Avoid -Wflex-array-member-not-at-end warning
authorGustavo A. R. Silva <gustavoars@kernel.org>
Fri, 28 Mar 2025 14:56:25 +0000 (08:56 -0600)
committerDanilo Krummrich <dakr@kernel.org>
Fri, 28 Mar 2025 15:19:36 +0000 (16:19 +0100)
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are
getting ready to enable it, globally.

Use the `DEFINE_RAW_FLEX()` helper for an on-stack definition of
a flexible structure where the size of the flexible-array member
is known at compile-time, and refactor the rest of the code,
accordingly.

So, with these changes, fix the following warning:

drivers/gpu/drm/nouveau/nvif/conn.c:34:38: 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>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/Z-a4meHAy-t58bcE@kspp
drivers/gpu/drm/nouveau/nvif/conn.c

index 9ee18cb992644c9506e51d673f7f3fcd996645a2..5a1a83c62a2a7583a606384c07669e513d99654d 100644 (file)
@@ -30,17 +30,17 @@ int
 nvif_conn_event_ctor(struct nvif_conn *conn, const char *name, nvif_event_func func, u8 types,
                     struct nvif_event *event)
 {
-       struct {
-               struct nvif_event_v0 base;
-               struct nvif_conn_event_v0 conn;
-       } args;
+       DEFINE_RAW_FLEX(struct nvif_event_v0, args, data,
+                       sizeof(struct nvif_conn_event_v0));
+       struct nvif_conn_event_v0 *args_conn =
+                               (struct nvif_conn_event_v0 *)args->data;
        int ret;
 
-       args.conn.version = 0;
-       args.conn.types = types;
+       args_conn->version = 0;
+       args_conn->types = types;
 
        ret = nvif_event_ctor_(&conn->object, name ?: "nvifConnHpd", nvif_conn_id(conn),
-                              func, true, &args.base, sizeof(args), false, event);
+                              func, true, args, __struct_size(args), false, event);
        NVIF_DEBUG(&conn->object, "[NEW EVENT:HPD types:%02x]", types);
        return ret;
 }