fbcon: use min() to make code cleaner

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>
Signed-off-by: Helge Deller <deller@gmx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220209084810.1561184-1-deng.changcheng@zte.com.cn

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 6a7d470beec76cfe2b97f5ff26d0530264b89d7e..c56dd2f73f79c4730a8684b9a50ab5f91b29e975 100644 (file)
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -578,7 +578,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)