[PATCH v2 02/28] video: fbcon: Fix warnings by using pr_debug() in fbcon

[Thomas Zimmermann]

Am 28.11.20 um 23:40 schrieb Sam Ravnborg:
> Replacing DPRINTK() statements with pr_debug fixes set but not used
> warnings.  And moves to a more standard logging setup at the same time.
> 
> v2:
>    - Fix indent (Joe)
> 
> Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
> Cc: Joe Perches <joe at perches.com>
> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie at samsung.com>
> Cc: Sam Ravnborg <sam at ravnborg.org>
> Cc: Jiri Slaby <jirislaby at kernel.org>
> Cc: Peilin Ye <yepeilin.cs at gmail.com>
> Cc: Tetsuo Handa <penguin-kernel at I-love.SAKURA.ne.jp>
> Cc: George Kennedy <george.kennedy at oracle.com>
> Cc: Nathan Chancellor <natechancellor at gmail.com>
> Cc: Peter Rosin <peda at axentia.se>
> ---
>   drivers/video/fbdev/core/fbcon.c | 25 ++++++++-----------------
>   1 file changed, 8 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
> index bf61598bf1c3..44a5cd2f54cc 100644
> --- a/drivers/video/fbdev/core/fbcon.c
> +++ b/drivers/video/fbdev/core/fbcon.c
> @@ -56,8 +56,6 @@
>    *  more details.
>    */
>   
> -#undef FBCONDEBUG
> -

I guess this was added for quick debugging during development. Anyway, I 
never liked these kinds of hacks.

Acked-by: Thomas Zimmermann <tzimmermann at suse.de>

>   #include <linux/module.h>
>   #include <linux/types.h>
>   #include <linux/fs.h>
> @@ -82,12 +80,6 @@
>   
>   #include "fbcon.h"
>   
> -#ifdef FBCONDEBUG
> -#  define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
> -#else
> -#  define DPRINTK(fmt, args...)
> -#endif
> -
>   /*
>    * FIXME: Locking
>    *
> @@ -1015,11 +1007,11 @@ static const char *fbcon_startup(void)
>   	rows /= vc->vc_font.height;
>   	vc_resize(vc, cols, rows);
>   
> -	DPRINTK("mode:   %s\n", info->fix.id);
> -	DPRINTK("visual: %d\n", info->fix.visual);
> -	DPRINTK("res:    %dx%d-%d\n", info->var.xres,
> -		info->var.yres,
> -		info->var.bits_per_pixel);
> +	pr_debug("mode:   %s\n", info->fix.id);
> +	pr_debug("visual: %d\n", info->fix.visual);
> +	pr_debug("res:    %dx%d-%d\n", info->var.xres,
> +		 info->var.yres,
> +		 info->var.bits_per_pixel);
>   
>   	fbcon_add_cursor_timer(info);
>   	return display_desc;
> @@ -2013,7 +2005,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,
>   	    y_diff < 0 || y_diff > virt_fh) {
>   		const struct fb_videomode *mode;
>   
> -		DPRINTK("attempting resize %ix%i\n", var.xres, var.yres);
> +		pr_debug("attempting resize %ix%i\n", var.xres, var.yres);
>   		mode = fb_find_best_mode(&var, &info->modelist);
>   		if (mode == NULL)
>   			return -EINVAL;
> @@ -2023,7 +2015,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,
>   		if (virt_w > var.xres/virt_fw || virt_h > var.yres/virt_fh)
>   			return -EINVAL;
>   
> -		DPRINTK("resize now %ix%i\n", var.xres, var.yres);
> +		pr_debug("resize now %ix%i\n", var.xres, var.yres);
>   		if (con_is_visible(vc)) {
>   			var.activate = FB_ACTIVATE_NOW |
>   				FB_ACTIVATE_FORCE;
> @@ -3299,8 +3291,7 @@ static void fbcon_exit(void)
>   
>   		if (info->queue.func)
>   			pending = cancel_work_sync(&info->queue);
> -		DPRINTK("fbcon: %s pending work\n", (pending ? "canceled" :
> -			"no"));
> +		pr_debug("fbcon: %s pending work\n", (pending ? "canceled" : "no"));
>   
>   		for (j = first_fb_vc; j <= last_fb_vc; j++) {
>   			if (con2fb_map[j] == i) {
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20201129/8978ff0b/attachment.sig>