struct nouveau_cli *cli = chan->cli;
        struct nouveau_drm *drm = cli->drm;
        struct nouveau_fence_priv *priv = (void*)drm->fence;
-       struct {
-               struct nvif_event_v0 base;
-               struct nvif_chan_event_v0 host;
-       } args;
+       DEFINE_RAW_FLEX(struct nvif_event_v0, args, data,
+                       sizeof(struct nvif_chan_event_v0));
+       struct nvif_chan_event_v0 *host =
+                               (struct nvif_chan_event_v0 *)args->data;
        int ret;
 
        INIT_WORK(&fctx->uevent_work, nouveau_fence_uevent_work);
        if (!priv->uevent)
                return;
 
-       args.host.version = 0;
-       args.host.type = NVIF_CHAN_EVENT_V0_NON_STALL_INTR;
+       host->version = 0;
+       host->type = NVIF_CHAN_EVENT_V0_NON_STALL_INTR;
 
        ret = nvif_event_ctor(&chan->user, "fenceNonStallIntr", (chan->runlist << 16) | chan->chid,
                              nouveau_fence_wait_uevent_handler, false,
-                             &args.base, sizeof(args), &fctx->event);
+                             args, __struct_size(args), &fctx->event);
 
        WARN_ON(ret);
 }