Re: [PATCH 2/9] media: iris: Replace ternary conditionals with max()

[Bryan O'Donoghue <bryan.odonoghue@linaro.org>]

On 29/06/2026 12:30, Ricardo Ribalda wrote:
> The max() macro is simpler to read than the current construction, it
> also makes cocci happier, which currently throws these warnings:
> 
> ./platform/qcom/iris/iris_vpu_buffer.c:703:13-15: WARNING opportunity for max()
> ./platform/qcom/iris/iris_vpu_buffer.c:583:23-25: WARNING opportunity for max()
> 
> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
> ---
>   drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> index fb6f1016415e..faebb5472866 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> @@ -580,7 +580,7 @@ static u32 hfi_buffer_line_av1d(u32 frame_width, u32 frame_height,
>   		ALIGN(size_av1d_qp(frame_width, frame_height), DMA_ALIGNMENT);
>   	opbwr8 = size_av1d_lb_opb_wr1_nv12_ubwc(frame_width, frame_height);
>   	opbwr10 = size_av1d_lb_opb_wr1_tp10_ubwc(frame_width, frame_height);
> -	opbwrbufsize = opbwr8 >= opbwr10 ? opbwr8 : opbwr10;
> +	opbwrbufsize = max(opbwr8, opbwr10);
>   	size = ALIGN((size + opbwrbufsize), DMA_ALIGNMENT);
>   	if (is_opb) {
>   		vpss_lb_size = size_vpss_lb(frame_width, frame_height);
> @@ -700,7 +700,7 @@ static u32 hfi_buffer_ibc_av1d(u32 frame_width, u32 frame_height)
> 
>   	ibc8 = size_av1d_ibc_nv12_ubwc(frame_width, frame_height);
>   	ibc10 = size_av1d_ibc_tp10_ubwc(frame_width, frame_height);
> -	size = ibc8 >= ibc10 ? ibc8 : ibc10;
> +	size = max(ibc8, ibc10);
> 
>   	return ALIGN(size, DMA_ALIGNMENT);
>   }
> 
> --
> 2.55.0.rc0.799.gd6f94ed593-goog
> 

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>

---
bod