diff mbox series

[v3,12/18] media: venus: Refactor struct hfi_session_get_property_pkt

Message ID 20240527-cocci-flexarray-v3-12-cda09c535816@chromium.org (mailing list archive)
State Superseded
Headers show
Series media: Fix the last set of coccinelle warnings | expand

Commit Message

Ricardo Ribalda May 27, 2024, 9:09 p.m. UTC
The struct hfi_session_get_property_pkt is always used to fectch 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)

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
 drivers/media/platform/qcom/venus/hfi_cmds.c | 4 ++--
 drivers/media/platform/qcom/venus/hfi_cmds.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Vikash Garodia June 18, 2024, 12:05 p.m. UTC | #1
On 5/28/2024 2:39 AM, Ricardo Ribalda wrote:
> The struct hfi_session_get_property_pkt is always used to fectch 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)
> 
> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
> ---
>  drivers/media/platform/qcom/venus/hfi_cmds.c | 4 ++--
>  drivers/media/platform/qcom/venus/hfi_cmds.h | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c
> index 3418d2dd9371..75f4a3d3e748 100644
> --- 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 6dff949c4402..f5708fdfb197 100644
> --- a/drivers/media/platform/qcom/venus/hfi_cmds.h
> +++ b/drivers/media/platform/qcom/venus/hfi_cmds.h
> @@ -191,7 +191,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 {
> 
Acked-by: Vikash Garodia <quic_vgarodia@quicinc.com>
Vikash Garodia June 18, 2024, 12:18 p.m. UTC | #2
On 6/18/2024 5:35 PM, Vikash Garodia wrote:
> 
> On 5/28/2024 2:39 AM, Ricardo Ribalda wrote:
>> The struct hfi_session_get_property_pkt is always used to fectch a
fectch -> fetch

>> 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)
>>
>> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
>> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
>> ---
>>  drivers/media/platform/qcom/venus/hfi_cmds.c | 4 ++--
>>  drivers/media/platform/qcom/venus/hfi_cmds.h | 2 +-
>>  2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c
>> index 3418d2dd9371..75f4a3d3e748 100644
>> --- 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 6dff949c4402..f5708fdfb197 100644
>> --- a/drivers/media/platform/qcom/venus/hfi_cmds.h
>> +++ b/drivers/media/platform/qcom/venus/hfi_cmds.h
>> @@ -191,7 +191,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 {
>>
> Acked-by: Vikash Garodia <quic_vgarodia@quicinc.com>
diff mbox series

Patch

diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c
index 3418d2dd9371..75f4a3d3e748 100644
--- 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 6dff949c4402..f5708fdfb197 100644
--- a/drivers/media/platform/qcom/venus/hfi_cmds.h
+++ b/drivers/media/platform/qcom/venus/hfi_cmds.h
@@ -191,7 +191,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 {