From: Changcheng Deng <deng.changch...@zte.com.cn>

Use min() in order to make code cleaner.

Reported-by: Zeal Robot <zea...@zte.com.cn>
Signed-off-by: Changcheng Deng <deng.changch...@zte.com.cn>
---
 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

Reply via email to