mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-05 18:14:07 +08:00
fbdev: pm[23]fb.c: fix -Wextra build warnings and errors
When 'DEBUG' is not defined, modify the DPRINTK() macro to use the no_printk() macro instead of using <empty>. This fixes build warnings when -Wextra is used and provides printk format checking: ../drivers/video/fbdev/pm2fb.c:227:38: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body] ../drivers/video/fbdev/pm3fb.c:1039:33: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body] Also drop one argument in two DPRINTK() macro uses to provide the correct number of arguments and use the correct field in one case to fix a build error: ../drivers/video/fbdev/pm3fb.c:353:9: error: ‘struct fb_info’ has no member named ‘current_par’ info->current_par->depth); Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Antonino Daplas <adaplas@gmail.com> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200315041002.24473-6-rdunlap@infradead.org
This commit is contained in:
parent
5194480ce6
commit
1a56b9fa32
@ -54,7 +54,7 @@
|
||||
#define DPRINTK(a, b...) \
|
||||
printk(KERN_DEBUG "pm2fb: %s: " a, __func__ , ## b)
|
||||
#else
|
||||
#define DPRINTK(a, b...)
|
||||
#define DPRINTK(a, b...) no_printk(a, ##b)
|
||||
#endif
|
||||
|
||||
#define PM2_PIXMAP_SIZE (1600 * 4)
|
||||
|
@ -44,7 +44,7 @@
|
||||
#define DPRINTK(a, b...) \
|
||||
printk(KERN_DEBUG "pm3fb: %s: " a, __func__ , ## b)
|
||||
#else
|
||||
#define DPRINTK(a, b...)
|
||||
#define DPRINTK(a, b...) no_printk(a, ##b)
|
||||
#endif
|
||||
|
||||
#define PM3_PIXMAP_SIZE (2048 * 4)
|
||||
@ -306,7 +306,7 @@ static void pm3fb_init_engine(struct fb_info *info)
|
||||
PM3PixelSize_GLOBAL_32BIT);
|
||||
break;
|
||||
default:
|
||||
DPRINTK(1, "Unsupported depth %d\n",
|
||||
DPRINTK("Unsupported depth %d\n",
|
||||
info->var.bits_per_pixel);
|
||||
break;
|
||||
}
|
||||
@ -349,8 +349,8 @@ static void pm3fb_init_engine(struct fb_info *info)
|
||||
(1 << 10) | (0 << 3));
|
||||
break;
|
||||
default:
|
||||
DPRINTK(1, "Unsupported depth %d\n",
|
||||
info->current_par->depth);
|
||||
DPRINTK("Unsupported depth %d\n",
|
||||
info->var.bits_per_pixel);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user