media: venus: Refactor struct hfi_session_get_property_pkt

The struct hfi_session_get_property_pkt is always used to fetch a
single property. Make that explicit in the code and avoid a single
element array at the end of the struct.

This change fixes the following cocci warning:
drivers/media/platform/qcom/venus/hfi_cmds.h:194:5-9: 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_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c
index 3418d2dd93711669a0548d411a3723dabe65be66..75f4a3d3e748f31421b7dd3aaabffef38cb1edb5 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi_cmds.c
+++ b/drivers/media/platform/qcom/venus/hfi_cmds.c
@@ -402,7 +402,7 @@ static int pkt_session_get_property_1x(struct hfi_session_get_property_pkt *pkt,
        pkt->shdr.hdr.pkt_type = HFI_CMD_SESSION_GET_PROPERTY;
        pkt->shdr.session_id = hash32_ptr(cookie);
        pkt->num_properties = 1;
-       pkt->data[0] = ptype;
+       pkt->data = ptype;
 
        return 0;
 }
@@ -1110,7 +1110,7 @@ pkt_session_get_property_3xx(struct hfi_session_get_property_pkt *pkt,
 
        switch (ptype) {
        case HFI_PROPERTY_CONFIG_VDEC_ENTROPY:
-               pkt->data[0] = HFI_PROPERTY_CONFIG_VDEC_ENTROPY;
+               pkt->data = HFI_PROPERTY_CONFIG_VDEC_ENTROPY;
                break;
        default:
                ret = pkt_session_get_property_1x(pkt, cookie, ptype);

diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.h b/drivers/media/platform/qcom/venus/hfi_cmds.h
index 20acd412ee7b9116f79c9ad6bde89db30f18a7e5..9152fcdef369f0aa3b56ebd819602c21f00c7b16 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi_cmds.h
+++ b/drivers/media/platform/qcom/venus/hfi_cmds.h
@@ -217,7 +217,7 @@ struct hfi_session_resume_pkt {
 struct hfi_session_get_property_pkt {
        struct hfi_session_hdr_pkt shdr;
        u32 num_properties;
-       u32 data[1];
+       u32 data;
 };
 
 struct hfi_session_release_buffer_pkt {