drm: omapdrm: dss: replace ternary operator with max()

[PATCH] drm: omapdrm: dss: replace ternary operator with max()

Posted by Guo Zhengkui 3 years, 11 months ago

Fix the following coccicheck warning:

drivers/gpu/drm/omapdrm/dss/dispc.c:2454:21-22: WARNING opportunity for max()

Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com>
---
 drivers/gpu/drm/omapdrm/dss/dispc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index c4de142cc85b..0ee344ebcd1c 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -2451,7 +2451,7 @@ static int dispc_ovl_calc_scaling_44xx(struct dispc_device *dispc,
 
 	*decim_x = DIV_ROUND_UP(width, in_width_max);
 
-	*decim_x = *decim_x > decim_x_min ? *decim_x : decim_x_min;
+	*decim_x = max(*decim_x, decim_x_min);
 	if (*decim_x > *x_predecim)
 		return -EINVAL;
 
-- 
2.20.1

Re: [PATCH] drm: omapdrm: dss: replace ternary operator with max()

Posted by Tomi Valkeinen 3 years, 8 months ago

On 17/05/2022 08:02, Guo Zhengkui wrote:
> Fix the following coccicheck warning:
> 
> drivers/gpu/drm/omapdrm/dss/dispc.c:2454:21-22: WARNING opportunity for max()
> 
> Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com>
> ---
>   drivers/gpu/drm/omapdrm/dss/dispc.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
> index c4de142cc85b..0ee344ebcd1c 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dispc.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
> @@ -2451,7 +2451,7 @@ static int dispc_ovl_calc_scaling_44xx(struct dispc_device *dispc,
>   
>   	*decim_x = DIV_ROUND_UP(width, in_width_max);
>   
> -	*decim_x = *decim_x > decim_x_min ? *decim_x : decim_x_min;
> +	*decim_x = max(*decim_x, decim_x_min);
>   	if (*decim_x > *x_predecim)
>   		return -EINVAL;
>   

Thanks, applying to drm-misc.

  Tomi