]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
crypto: starfive - Avoid -Wflex-array-member-not-at-end warning
authorGustavo A. R. Silva <gustavoars@kernel.org>
Fri, 21 Nov 2025 03:56:21 +0000 (12:56 +0900)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 19 Dec 2025 06:47:46 +0000 (14:47 +0800)
-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 corresponding
structure. Notice that `struct ahash_request` is a flexible structure,
this is a structure that contains a flexible-array member.

With these changes fix the following warning:

drivers/crypto/starfive/jh7110-cryp.h:219:49: 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: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/starfive/jh7110-cryp.h

index 5ed4ba5da7f9ec6059d66a0da4ee99d6ae0cb51f..f85d6fb81ca8facd67c38d8bedb7877a4414dc7e 100644 (file)
@@ -216,13 +216,15 @@ struct starfive_cryp_request_ctx {
 
        struct scatterlist                      *in_sg;
        struct scatterlist                      *out_sg;
-       struct ahash_request                    ahash_fbk_req;
        size_t                                  total;
        unsigned int                            blksize;
        unsigned int                            digsize;
        unsigned long                           in_sg_len;
        unsigned char                           *adata;
        u8 rsa_data[STARFIVE_RSA_MAX_KEYSZ] __aligned(sizeof(u32));
+
+       /* Must be last as it ends in a flexible-array member. */
+       struct ahash_request                    ahash_fbk_req;
 };
 
 struct starfive_cryp_dev *starfive_cryp_find_dev(struct starfive_cryp_ctx *ctx);