Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Date:   Wed, 9 Feb 2022 19:54:25 +0100
From:   Sam Ravnborg <sam@ravnborg.org>
To:     cgel.zte@gmail.com
Cc:     deller@gmx.de, linux-fbdev@vger.kernel.org, ducheng2@gmail.com,
        penguin-kernel@i-love.sakura.ne.jp, daniel.vetter@ffwll.ch,
        Zeal Robot <zealci@zte.com.cn>, deng.changcheng@zte.com.cn,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
        cssk@net-c.es, geert@linux-m68k.org, svens@stackframe.org
Subject: Re: [PATCH] fbcon: use min() to make code cleaner
Message-ID: <YgQN4WXXjSHVDiBK@ravnborg.org>
References: <20220209084810.1561184-1-deng.changcheng@zte.com.cn>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220209084810.1561184-1-deng.changcheng@zte.com.cn>
Precedence: bulk

On Wed, Feb 09, 2022 at 08:48:10AM +0000, cgel.zte@gmail.com wrote:
> From: Changcheng Deng <deng.changcheng@zte.com.cn>
> 
> Use min() in order to make code cleaner.
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Changcheng Deng <deng.changcheng@zte.com.cn>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>

I had preferred in minmax.h was included, but it has an indirect include
so shrug.

I assume Daniel or Helge will pick it up.

	Sam

> ---
>  drivers/video/fbdev/core/fbcon.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
> index f36829eeb5a9..61171159fee2 100644
> --- a/drivers/video/fbdev/core/fbcon.c
> +++ b/drivers/video/fbdev/core/fbcon.c
> @@ -602,7 +602,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
>  		save = kmalloc(array3_size(logo_lines, new_cols, 2),
>  			       GFP_KERNEL);
>  		if (save) {
> -			int i = cols < new_cols ? cols : new_cols;
> +			int i = min(cols, new_cols);
>  			scr_memsetw(save, erase, array3_size(logo_lines, new_cols, 2));
>  			r = q - step;
>  			for (cnt = 0; cnt < logo_lines; cnt++, r += i)
> -- 
> 2.25.1