Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Message-ID: <2bfcb259-5f81-2110-2027-cc9e61d4d671@gmx.de>
Date:   Wed, 9 Feb 2022 22:24:47 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.0
Subject: Re: [PATCH] fbcon: use min() to make code cleaner
Content-Language: en-US
To:     Sam Ravnborg <sam@ravnborg.org>, cgel.zte@gmail.com
Cc:     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
References: <20220209084810.1561184-1-deng.changcheng@zte.com.cn>
 <YgQN4WXXjSHVDiBK@ravnborg.org>
From:   Helge Deller <deller@gmx.de>
In-Reply-To: <YgQN4WXXjSHVDiBK@ravnborg.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On 2/9/22 19:54, Sam Ravnborg wrote:
> 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.

Daniel has quite some upcoming changes to core/fbcon, so I prefer
that he takes it when he thinks it's the right time...

Helge

>
>> ---
>>  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/cor=
e/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 =3D kmalloc(array3_size(logo_lines, new_cols, 2),
>>  			       GFP_KERNEL);
>>  		if (save) {
>> -			int i =3D cols < new_cols ? cols : new_cols;
>> +			int i =3D min(cols, new_cols);
>>  			scr_memsetw(save, erase, array3_size(logo_lines, new_cols, 2));
>>  			r =3D q - step;
>>  			for (cnt =3D 0; cnt < logo_lines; cnt++, r +=3D i)
>> --
>> 2.25.1