diff mbox series

fbcon: Avoid 'cap' set but not used warning

Message ID YgFB4xqI+As196FR@p100 (mailing list archive)
State Accepted, archived
Headers show
Series fbcon: Avoid 'cap' set but not used warning | expand

Commit Message

Helge Deller Feb. 7, 2022, 3:59 p.m. UTC 
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_ACCELERATION
is enabled. Drop the temporary variable and use info->flags instead.

Fixes: 87ab9f6b7417 ("Revert "fbcon: Disable accelerated scrolling")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Helge Deller <deller@gmx.de>

Comments

Daniel Vetter Feb. 8, 2022, 1:44 p.m. UTC | #1 
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_ACCELERATION
> is enabled. Drop the temporary variable and use info->flags instead.
> 
> Fixes: 87ab9f6b7417 ("Revert "fbcon: Disable accelerated scrolling")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Helge Deller <deller@gmx.de>

Applied to drm-misc-fixes.

btw I think would still make sense to grab drm-misc commit rights for you,
so you can push stuff like this directly.

Thanks, Daniel

> 
> diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/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 init)
>  	struct vc_data *svc = *default_mode;
>  	struct fbcon_display *t, *p = &fb_display[vc->vc_num];
>  	int logo = 1, new_rows, new_cols, rows, cols;
> -	int cap, ret;
> +	int ret;
> 
>  	if (WARN_ON(info_idx == -1))
>  	    return;
> @@ -1034,7 +1034,6 @@ static void fbcon_init(struct vc_data *vc, int init)
>  		con2fb_map[vc->vc_num] = info_idx;
> 
>  	info = registered_fb[con2fb_map[vc->vc_num]];
> -	cap = info->flags;
> 
>  	if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
>  		logo_shown = FBCON_LOGO_DONTSHOW;
> @@ -1137,8 +1136,8 @@ static void fbcon_init(struct vc_data *vc, int init)
>  	ops->graphics = 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 = SCROLL_MOVE;
>  	else /* default to something safe */
>  		p->scrollmode = SCROLL_REDRAW;
Helge Deller Feb. 8, 2022, 4:23 p.m. UTC | #2 
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_ACCELERATION
>> is enabled. Drop the temporary variable and use info->flags instead.
>>
>> Fixes: 87ab9f6b7417 ("Revert "fbcon: Disable accelerated scrolling")
>> Reported-by: kernel test robot <lkp@intel.com>
>> Signed-off-by: Helge Deller <deller@gmx.de>
>
> Applied to drm-misc-fixes.

Thanks!

> btw I think would still make sense to grab drm-misc commit rights for you,
> so you can push stuff like this directly.

Yes, for such trivial patches to e.g. fbcon it makes sense to have git-push 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/core/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 init)
>>  	struct vc_data *svc = *default_mode;
>>  	struct fbcon_display *t, *p = &fb_display[vc->vc_num];
>>  	int logo = 1, new_rows, new_cols, rows, cols;
>> -	int cap, ret;
>> +	int ret;
>>
>>  	if (WARN_ON(info_idx == -1))
>>  	    return;
>> @@ -1034,7 +1034,6 @@ static void fbcon_init(struct vc_data *vc, int init)
>>  		con2fb_map[vc->vc_num] = info_idx;
>>
>>  	info = registered_fb[con2fb_map[vc->vc_num]];
>> -	cap = info->flags;
>>
>>  	if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
>>  		logo_shown = FBCON_LOGO_DONTSHOW;
>> @@ -1137,8 +1136,8 @@ static void fbcon_init(struct vc_data *vc, int init)
>>  	ops->graphics = 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 = SCROLL_MOVE;
>>  	else /* default to something safe */
>>  		p->scrollmode = SCROLL_REDRAW;
>
diff mbox series

Patch

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/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 init)
 	struct vc_data *svc = *default_mode;
 	struct fbcon_display *t, *p = &fb_display[vc->vc_num];
 	int logo = 1, new_rows, new_cols, rows, cols;
-	int cap, ret;
+	int ret;

 	if (WARN_ON(info_idx == -1))
 	    return;
@@ -1034,7 +1034,6 @@  static void fbcon_init(struct vc_data *vc, int init)
 		con2fb_map[vc->vc_num] = info_idx;

 	info = registered_fb[con2fb_map[vc->vc_num]];
-	cap = info->flags;

 	if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
 		logo_shown = FBCON_LOGO_DONTSHOW;
@@ -1137,8 +1136,8 @@  static void fbcon_init(struct vc_data *vc, int init)
 	ops->graphics = 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 = SCROLL_MOVE;
 	else /* default to something safe */
 		p->scrollmode = SCROLL_REDRAW;