video: fbcon: Fix warnings by using pr_debug() in fbcon
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@ravnborg.org> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: Joe Perches <joe@perches.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Jiri Slaby <jirislaby@kernel.org> Cc: Peilin Ye <yepeilin.cs@gmail.com> Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: George Kennedy <george.kennedy@oracle.com> Cc: Nathan Chancellor <natechancellor@gmail.com> Cc: Peter Rosin <peda@axentia.se> Link: https://patchwork.freedesktop.org/patch/msgid/20201128224114.1033617-3-sam@ravnborg.org
This commit is contained in:
Родитель
891948966b
Коммит
b1cba76de6
|
@ -56,8 +56,6 @@
|
|||
* more details.
|
||||
*/
|
||||
|
||||
#undef FBCONDEBUG
|
||||
|
||||
#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) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче