Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iio: proximity: cros_ec_mkbp_proximity: 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/iio/proximity/cros_ec_mkbp_proximity.c:63:40: 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>
Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org>
Link: https://patch.msgid.link/Z9lEYdPPIyiRGm36@kspp
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Gustavo A. R. Silva and committed by
Jonathan Cameron
c72ada99 dc0e0712

+5 -10
+5 -10
drivers/iio/proximity/cros_ec_mkbp_proximity.c
··· 59 59 static int cros_ec_mkbp_proximity_query(struct cros_ec_device *ec_dev, 60 60 int *state) 61 61 { 62 - struct { 63 - struct cros_ec_command msg; 64 - union { 65 - struct ec_params_mkbp_info params; 66 - u32 switches; 67 - }; 68 - } __packed buf = { }; 69 - struct ec_params_mkbp_info *params = &buf.params; 70 - struct cros_ec_command *msg = &buf.msg; 71 - u32 *switches = &buf.switches; 62 + DEFINE_RAW_FLEX(struct cros_ec_command, buf, data, 63 + MAX(sizeof(u32), sizeof(struct ec_params_mkbp_info))); 64 + struct ec_params_mkbp_info *params = (struct ec_params_mkbp_info *)buf->data; 65 + struct cros_ec_command *msg = buf; 66 + u32 *switches = (u32 *)buf->data; 72 67 size_t insize = sizeof(*switches); 73 68 int ret; 74 69