media: venus: Refactor struct hfi_uncompressed_format_supported

plane_info is not a typical array, the data is not contiguous:
pinfo = (void *)pinfo + sizeof(*constr) * num_planes +
	2 * sizeof(u32);

Replace the single element array with a single element field.

This fixes the following cocci warning:
drivers/media/platform/qcom/venus/hfi_helper.h:1009:36-46: WARNING use flexible-array member instead (https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Acked-by: Vikash Garodia <quic_vgarodia@quicinc.com>
Signed-off-by: Stanimir Varbanov <stanimir.k.varbanov@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/platform/qcom/venus/hfi_helper.h b/drivers/media/platform/qcom/venus/hfi_helper.h
index 5e91f3f6984da674db1067b00115d189210eccdd..3edefa4edeb95dd0b834237054040fbf2bb1c97b 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi_helper.h
+++ b/drivers/media/platform/qcom/venus/hfi_helper.h
@@ -1011,7 +1011,7 @@ struct hfi_uncompressed_plane_info {
 struct hfi_uncompressed_format_supported {
        u32 buffer_type;
        u32 format_entries;
-       struct hfi_uncompressed_plane_info plane_info[1];
+       struct hfi_uncompressed_plane_info plane_info;
 };
 
 struct hfi_uncompressed_plane_actual {

diff --git a/drivers/media/platform/qcom/venus/hfi_parser.c b/drivers/media/platform/qcom/venus/hfi_parser.c
index c43839539d4ddabff75ba0113110d4a8027a0dc8..3df241dc3a118bcdeb2c28a6ffdb907b644d5653 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi_parser.c
+++ b/drivers/media/platform/qcom/venus/hfi_parser.c
@@ -157,7 +157,7 @@ static void
 parse_raw_formats(struct venus_core *core, u32 codecs, u32 domain, void *data)
 {
        struct hfi_uncompressed_format_supported *fmt = data;
-       struct hfi_uncompressed_plane_info *pinfo = fmt->plane_info;
+       struct hfi_uncompressed_plane_info *pinfo = &fmt->plane_info;
        struct hfi_uncompressed_plane_constraints *constr;
        struct raw_formats rawfmts[MAX_FMT_ENTRIES] = {};
        u32 entries = fmt->format_entries;