From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82ED1C433F5 for ; Tue, 8 Feb 2022 16:23:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1383127AbiBHQXu (ORCPT ); Tue, 8 Feb 2022 11:23:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352165AbiBHQXt (ORCPT ); Tue, 8 Feb 2022 11:23:49 -0500 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4247BC061578 for ; Tue, 8 Feb 2022 08:23:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644337422; bh=XThKsYT3SSJDiqTd/cXFxOMEVDw/FGebkK8AA7t32ug=; h=X-UI-Sender-Class:Date:Subject:To:Cc:References:From:In-Reply-To; b=K2SOJjhU59b23DveJCHOw764L56MQasqumPLcGm3vm2YIF0gjPf4YMxNDhDDjNGwQ Okr949Bh9eOJztAT4bIKt85W8aU0lfJurJUKWOQtY+M1MYUw+gTSSUdPbbaGnu0jvV 1qGktZ12jXKqOxSdXaVy1CY5eV9t/lJe4ljZjAvQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.20.60] ([92.116.144.255]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Md6Qr-1nqG452Sfr-00aGEU; Tue, 08 Feb 2022 17:23:42 +0100 Message-ID: Date: Tue, 8 Feb 2022 17:23:39 +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: Avoid 'cap' set but not used warning Content-Language: en-US To: Daniel Vetter Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org References: From: Helge Deller In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:DQ2UQXaPHNaHX/KiSwR0UEXxisFLIzTQ0pBVIxjm5rk3yggZHL3 FHxFS8iYdWCceejT54iamAISAI+hoPUkzoO2lsgW+qzFTf4XPq2dMeBP7i8Utx4tw1xAcah qEghjTTBYsUpPCjF4iPGwgw+1zYOtwiIX4ar63uv37V574oiKkChSkr16+m39J98enj2nED +C3GK72yGxEVa04UuDTAA== X-UI-Out-Filterresults: notjunk:1;V03:K0:9RDiH95oPoY=:1rtdMUUt231M2W8wexZuiv YyVIw/Yo6SVf09sMfwYZvpRTEMO7aj5vc/fWJHrRct9ubY/U8sBIQPBnWtubKyW9suww66X6A zcPOc/GJKXzvEUDPt2HLYntTyUaE1vhL9YVXjdiwaS7V12q9FClrxU4WhaWZWJBJWIKG2QDPT 1ks41A9xd3MqVLePZOH5odmWRGKeEkD3M9dB4pbRXazL3dxPzJ3A0z3yPJyur5440hsg1gKoM epWMQkcUSMXIDxoXwggHRIygQpaza78daK+nepdsb1FbRUiO5Hh+aiEFUsRT0A1IW0mvrn1pc x0qgHRr/muDqzX+FEB0cfFO8P34tKU064Db4yc8B2qBBEsSLUUp9FWt71WkZmyD3POvr4z5pI YU4EPY7wVriW2sbST4JO/YPrqLwbnbIOP4cRwTURytYlMWkIqvL1fOcEXJIZRAaHoTjSQfk14 uKhY+vjzNsi3Rd6RQSE69uxpHLVi1a+YGVLqmr7gKlus1DU1LDx500pyP7WJjFOHZ9vbGBPo5 L2LpLh/ZN2ij3N06f76A1ZE+njPNgOKfM0HlM7eTo0ycwyozroij9SwEf67c1fU6ewp5Kbgbm QjA2jkgeEFpqCyACPFyd+G4F955EIpALcJNtQpCNnwK0ew8dTW1CYuQYhDJ2xaV0KvxHJUK9v XIVombNiCYKvj6+bhVMW28Bgm66NzMbRiMZ7MSpYrF4ki+5Wws8zw1Pg6UcY0dV7xkjw2gJ/h 1mPPeyijQwYwRIvSwdOo/4nouNZuQdeDPGrpTnbE/LkMe/hTXwiKOFIDrON0gdb8be/JrXTpX 1KzF0eUSpiEzOoici7UGUiMyQtbM/EvIBcVI/XmHtSbTRGv4GCgD6H2yjbgVBFIbLX6eU4iP5 t+EPWS3xIMUxkUUoZcYpeWw5q8n1/nlv9pvMCRDljKKYOr5bMkEnUEn6Wk4Ygf8p8l8/QI7uD a2Exyf1ULUfmJqvs4ONVoNb/5MyJGgY5IibYRpJV5ZvSfd2ECyfaeGmb6MBb0b6rH1ZsTmF58 cpm4+9cjZsIlbwKyNO3ay0jw6gxdo0gjhitZfaZ8bcb/00zmjsU7Z2wEegGiTxMLlg== Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org On 2/8/22 14:44, Daniel Vetter wrote: > On Mon, Feb 07, 2022 at 04:59:31PM +0100, Helge Deller wrote: >> Fix this kernel test robot warning: >> >> drivers/video/fbdev/core/fbcon.c: In function 'fbcon_init': >> drivers/video/fbdev/core/fbcon.c:1028:6: warning: variable 'cap' set = but not used [-Wunused-but-set-variable] >> >> The cap variable is only used when CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_AC= CELERATION >> is enabled. Drop the temporary variable and use info->flags instead. >> >> Fixes: 87ab9f6b7417 ("Revert "fbcon: Disable accelerated scrolling") >> Reported-by: kernel test robot >> Signed-off-by: Helge Deller > > Applied to drm-misc-fixes. Thanks! > btw I think would still make sense to grab drm-misc commit rights for yo= u, > so you can push stuff like this directly. Yes, for such trivial patches to e.g. fbcon it makes sense to have git-pus= h rights. I've just created a ticket for this: https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/417 Thanks! Helge > Thanks, Daniel > >> >> diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/cor= e/fbcon.c >> index f36829eeb5a9..2fc1b80a26ad 100644 >> --- a/drivers/video/fbdev/core/fbcon.c >> +++ b/drivers/video/fbdev/core/fbcon.c >> @@ -1025,7 +1025,7 @@ static void fbcon_init(struct vc_data *vc, int in= it) >> struct vc_data *svc =3D *default_mode; >> struct fbcon_display *t, *p =3D &fb_display[vc->vc_num]; >> int logo =3D 1, new_rows, new_cols, rows, cols; >> - int cap, ret; >> + int ret; >> >> if (WARN_ON(info_idx =3D=3D -1)) >> return; >> @@ -1034,7 +1034,6 @@ static void fbcon_init(struct vc_data *vc, int in= it) >> con2fb_map[vc->vc_num] =3D info_idx; >> >> info =3D registered_fb[con2fb_map[vc->vc_num]]; >> - cap =3D info->flags; >> >> if (logo_shown < 0 && console_loglevel <=3D CONSOLE_LOGLEVEL_QUIET) >> logo_shown =3D FBCON_LOGO_DONTSHOW; >> @@ -1137,8 +1136,8 @@ static void fbcon_init(struct vc_data *vc, int in= it) >> ops->graphics =3D 0; >> >> #ifdef CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION >> - if ((cap & FBINFO_HWACCEL_COPYAREA) && >> - !(cap & FBINFO_HWACCEL_DISABLED)) >> + if ((info->flags & FBINFO_HWACCEL_COPYAREA) && >> + !(info->flags & FBINFO_HWACCEL_DISABLED)) >> p->scrollmode =3D SCROLL_MOVE; >> else /* default to something safe */ >> p->scrollmode =3D SCROLL_REDRAW; >