drm/nouveau/conn: Avoid -Wflex-array-member-not-at-end warning
Subsystems (3)
PATCH 1/1 drm/nouveau/conn: Avoid -Wflex-array-member-not-at-end warning
-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]
--- drivers/gpu/drm/nouveau/nvif/conn.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/nouveau/nvif/conn.c +7 -7
@@ -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; }
Signature · 1 line
2.43.0
Quoted 8 lines · Gustavo A. R. Silva
-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.
Quoted 5 lines
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 <[email protected]>
Applied to drm-misc-next, thanks!