archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 05:04:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/nouveau/outp: Avoid -Wflex-array-member-not-at-end warning

Browse source 
-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/outp.c:199:45: 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-bFsmWjr5yZy6c6@kspp
This commit is contained in:
Gustavo A. R. Silva 2025-03-28 09:52:18 -06:00 • committed by Danilo Krummrich
parent 8226bc5ac8
commit 0b50eb7f3a
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/gpu/drm/nouveau/nvif/outp.c
View file

@ -195,20 +195,17 @@ nvif_outp_dp_aux_pwr(struct nvif_outp *outp, bool enable)
int
nvif_outp_hda_eld(struct nvif_outp *outp, int head, void *data, u32 size)
{
struct {
struct nvif_outp_hda_eld_v0 mthd;
u8 data[128];
} args;
DEFINE_RAW_FLEX(struct nvif_outp_hda_eld_v0, mthd, data, 128);
int ret;
if (WARN_ON(size > ARRAY_SIZE(args.data)))
if (WARN_ON(size > (__struct_size(mthd) - sizeof(*mthd))))
return -EINVAL;
args.mthd.version = 0;
args.mthd.head = head;
mthd->version = 0;
mthd->head = head;
memcpy(args.data, data, size);
ret = nvif_mthd(&outp->object, NVIF_OUTP_V0_HDA_ELD, &args, sizeof(args.mthd) + size);
memcpy(mthd->data, data, size);
ret = nvif_mthd(&outp->object, NVIF_OUTP_V0_HDA_ELD, mthd, sizeof(*mthd) + size);
NVIF_ERRON(ret, &outp->object, "[HDA_ELD head:%d size:%d]", head, size);
return ret;
}