Printk() is replaced with pr_* respective functions in efifb.c
Subsystems (3)
PATCH 1/3 Printk() is replaced with pr_* respective functions in efifb.c
This is a trivial patch:
I have replaced printk() with respective pr_* functions.
--- drivers/video/fbdev/efifb.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/video/fbdev/efifb.c +4 -4
@@ -142,10 +142,10 @@ static int efifb_probe(struct platform_device *dev)if (!screen_info.pages) screen_info.pages =1 ;if (!screen_info.lfb_base) { -printk (KERN_DEBUG "efifb: invalid framebuffer address\n" ); +pr_err ("efifb: invalid framebuffer address\n" );return -ENODEV ; } -printk (KERN_INFO "efifb: probing for efifb\n" ); +pr_info ("efifb: probing for efifb\n" );/* just assume they're all unset if any are */ if (!screen_info.blue_size) {
@@ -193,14 +193,14 @@ static int efifb_probe(struct platform_device *dev) }else {/* We cannot make this fatal. Sometimes this comes from magic spaces our resource handlers simply don't know about */ -printk (KERN_WARNING +pr_warn ("efifb: cannot reserve video memory at 0x%lx\n" , efifb_fix.smem_start); } info =framebuffer_alloc (sizeof (u32) *16 , &dev->dev);if (!info) { -printk (KERN_ERR "efifb: cannot allocate framebuffer\n" ); +pr_err ("efifb: cannot allocate framebuffer\n" ); err = -ENOMEM ; goto err_release_mem; }
@@ -218,18 +218,18 @@ static int efifb_probe(struct platform_device *dev) info->screen_base = ioremap_wc(efifb_fix.smem_start,
efifb_fix.smem_len);
if (!info->screen_base) {
- printk(KERN_ERR "efifb: abort, cannot ioremap video memory "
+ pr_err("efifb: abort, cannot ioremap video memory "
"0x%x @ 0x%lx\n",
efifb_fix.smem_len, efifb_fix.smem_start);
err = -EIO;
goto err_release_fb;
}- printk(KERN_INFO "efifb: framebuffer at 0x%lx, mapped to 0x%p, "
+ pr_info("efifb: framebuffer at 0x%lx, mapped to 0x%p, "
"using %dk, total %dk\n",
efifb_fix.smem_start, info->screen_base,
size_remap/1024, size_total/1024);
- printk(KERN_INFO "efifb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
+ pr_info("efifb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
efifb_defined.xres, efifb_defined.yres,
efifb_defined.bits_per_pixel, efifb_fix.line_length,
screen_info.pages);
@@ -237,7 +237,7 @@ static int efifb_probe(struct platform_device *dev)
efifb_defined.xres_virtual = efifb_defined.xres;
efifb_defined.yres_virtual = efifb_fix.smem_len /
efifb_fix.line_length;
- printk(KERN_INFO "efifb: scrolling: redraw\n");
+ pr_info("efifb: scrolling: redraw\n");
efifb_defined.yres_virtual = efifb_defined.yres;
/* some dummy values for timing to make fbset happy */
@@ -255,7 +255,7 @@ static int efifb_probe(struct platform_device *dev)
efifb_defined.transp.offset = screen_info.rsvd_pos;
efifb_defined.transp.length = screen_info.rsvd_size;- printk(KERN_INFO "efifb: %s: "
+ pr_info("efifb: %s: "
"size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",
"Truecolor",
screen_info.rsvd_size,
@@ -276,11 +276,11 @@ static int efifb_probe(struct platform_device *dev)
info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE;
if ((err = fb_alloc_cmap(&info->cmap, 256, 0)) < 0) {
- printk(KERN_ERR "efifb: cannot allocate colormap\n");
+ pr_err("efifb: cannot allocate colormap\n");
goto err_unmap;
}
if ((err = register_framebuffer(info)) < 0) {
- printk(KERN_ERR "efifb: cannot register framebuffer\n");
+ pr_err("efifb: cannot register framebuffer\n");
goto err_fb_dealoc;
}
fb_info(info, "%s frame buffer device\n", info->fix.id);--
1.9.3
-Parmeshwr
Quoted 3 lines · Parmeshwr Prasad
This is a trivial patch:
I have replaced
printk()with respective pr_* functions.
Hi.
A few suggestions:
o Add this #define before any include
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
o Strip the embedded "efifb: " prefixes from the formats
o Coalesce the formats
o Don't change KERN_<LEVEL> uses unnecessarily
If you do change logging levels, state why in the change log
o Align the multiline arguments
diriveom rrs/video/fbdev/efifb.c
Quoted 1 line
diriveom rrs/video/fbdev/efifb.c renamed from drivers/video/fbdev/efifb.c +0
-0
[]
diriveom rrs/video/fbdev/efifb.c static int efifb_probe(struct platform_device *dev) · line 145
Quoted 6 lines
diriveom rrs/video/fbdev/efifb.c renamed from drivers/video/fbdev/efifb.c +1
-1@@ -142,10 +142,10 @@ static int efifb_probe(struct platform_device *dev)if (!screen_info.pages) screen_info.pages =1 ;if (!screen_info.lfb_base) { -printk (KERN_DEBUG "efifb: invalid framebuffer address\n" ); +pr_err ("efifb: invalid framebuffer address\n" );
Strip the "efifb: " prefix from all the pr_<level> uses
pr_err("invalid framebuffer address\n");diriveom rrs/video/fbdev/efifb.c static int efifb_probe(struct platform_device *dev) · line 198
Quoted 8 lines
diriveom rrs/video/fbdev/efifb.c renamed from drivers/video/fbdev/efifb.c +1
-1@@ -193,14 +193,14 @@ static int efifb_probe(struct platform_device *dev) }else {/* We cannot make this fatal. Sometimes this comes from magic spaces our resource handlers simply don't know about */ -printk (KERN_WARNING +pr_warn ("efifb: cannot reserve video memory at 0x%lx\n" , efifb_fix.smem_start);
Move the format to the same line as pr_warn
pr_warn("cannot reserve video memory at 0x%lx\n",diriveom rrs/video/fbdev/efifb.c static int efifb_probe(struct platform_device *dev) · line 223
Quoted 8 lines
diriveom rrs/video/fbdev/efifb.c renamed from drivers/video/fbdev/efifb.c +1
-1@@ -218,18 +218,18 @@ static int efifb_probe(struct platform_device *dev) info->screen_base =ioremap_wc (efifb_fix.smem_start, efifb_fix.smem_len);if (!info->screen_base) { -printk (KERN_ERR "efifb: abort, cannot ioremap video memory " +pr_err ("efifb: abort, cannot ioremap video memory " "0x%x @ 0x%lx\n" , efifb_fix.smem_len, efifb_fix.smem_start);
Coalesce the format and align the arguments
pr_err("abort, cannot ioremap video memory 0x%x @ 0x%lx\n"
efifb_fix.smem_len, efifb_fix.smem_start);You should end up with something like:
--- drivers/video/fbdev/efifb.c | 57 +++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 30 deletions(-)
drivers/video/fbdev/efifb.c +27 -30
@@ -6,6 +6,8 @@* */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h>
@@ -142,10 +144,10 @@ static int efifb_probe(struct platform_device *dev)if (!screen_info.pages) screen_info.pages =1 ;if (!screen_info.lfb_base) { -printk (KERN_DEBUG "efifb: invalid framebuffer address\n" ); +pr_debug ("invalid framebuffer address\n" );return -ENODEV ; } -printk (KERN_INFO "efifb: probing for efifb\n" ); +pr_info ("probing for efifb\n" );/* just assume they're all unset if any are */ if (!screen_info.blue_size) {
@@ -193,14 +195,13 @@ static int efifb_probe(struct platform_device *dev) }else {/* We cannot make this fatal. Sometimes this comes from magic spaces our resource handlers simply don't know about */ -printk (KERN_WARNING -"efifb: cannot reserve video memory at 0x%lx\n" , +pr_warn ("cannot reserve video memory at 0x%lx\n" , efifb_fix.smem_start); } info =framebuffer_alloc (sizeof (u32) *16 , &dev->dev);if (!info) { -printk (KERN_ERR "efifb: cannot allocate framebuffer\n" ); +pr_err ("cannot allocate framebuffer\n" ); err = -ENOMEM ; goto err_release_mem; }
@@ -218,26 +219,24 @@ static int efifb_probe(struct platform_device *dev) info->screen_base =ioremap_wc (efifb_fix.smem_start, efifb_fix.smem_len);if (!info->screen_base) { -printk (KERN_ERR "efifb: abort, cannot ioremap video memory " -"0x%x @ 0x%lx\n" , - efifb_fix.smem_len, efifb_fix.smem_start); +pr_err ("abort, cannot ioremap video memory 0x%x @ 0x%lx\n" , + efifb_fix.smem_len, efifb_fix.smem_start); err = -EIO ; goto err_release_fb; } -printk (KERN_INFO "efifb: framebuffer at 0x%lx, mapped to 0x%p, " -"using %dk, total %dk\n" , - efifb_fix.smem_start, info->screen_base, - size_remap/1024 , size_total/1024 ); -printk (KERN_INFO "efifb: mode is %dx%dx%d, linelength=%d, pages=%d\n" , - efifb_defined.xres, efifb_defined.yres, - efifb_defined.bits_per_pixel, efifb_fix.line_length, - screen_info.pages); +pr_info ("framebuffer at 0x%lx, mapped to 0x%p, using %dk, total %dk\n" , + efifb_fix.smem_start, info->screen_base, + size_remap /1024 , size_total /1024 ); +pr_info ("mode is %dx%dx%d, linelength=%d, pages=%d\n" , + efifb_defined.xres, efifb_defined.yres, + efifb_defined.bits_per_pixel, efifb_fix.line_length, + screen_info.pages); efifb_defined.xres_virtual = efifb_defined.xres; efifb_defined.yres_virtual = efifb_fix.smem_len / efifb_fix.line_length; -printk (KERN_INFO "efifb: scrolling: redraw\n" ); +pr_info ("scrolling: redraw\n" ); efifb_defined.yres_virtual = efifb_defined.yres;/* some dummy values for timing to make fbset happy */
@@ -255,17 +254,15 @@ static int efifb_probe(struct platform_device *dev) efifb_defined.transp.offset = screen_info.rsvd_pos; efifb_defined.transp.length = screen_info.rsvd_size; -printk (KERN_INFO "efifb: %s: " -"size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n" , -"Truecolor" , - screen_info.rsvd_size, - screen_info.red_size, - screen_info.green_size, - screen_info.blue_size, - screen_info.rsvd_pos, - screen_info.red_pos, - screen_info.green_pos, - screen_info.blue_pos); +pr_info ("Truecolor: size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n" , + screen_info.rsvd_size, + screen_info.red_size, + screen_info.green_size, + screen_info.blue_size, + screen_info.rsvd_pos, + screen_info.red_pos, + screen_info.green_pos, + screen_info.blue_pos); efifb_fix.ypanstep =0 ; efifb_fix.ywrapstep =0 ;
@@ -276,11 +273,11 @@ static int efifb_probe(struct platform_device *dev) info->flags =FBINFO_FLAG_DEFAULT |FBINFO_MISC_FIRMWARE ;if ((err =fb_alloc_cmap (&info->cmap,256 ,0 )) <0 ) { -printk (KERN_ERR "efifb: cannot allocate colormap\n" ); +pr_err ("cannot allocate colormap\n" ); goto err_unmap; }if ((err =register_framebuffer (info)) <0 ) { -printk (KERN_ERR "efifb: cannot register framebuffer\n" ); +pr_err ("cannot register framebuffer\n" ); goto err_fb_dealoc; }fb_info (info,"%s frame buffer device\n" , info->fix.id);
Thanks Joe for your suggestion.
I have changes patch as you said.
--- drivers/video/fbdev/efifb.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
drivers/video/fbdev/efifb.c +7 -5
@@ -6,6 +6,8 @@* */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h>
@@ -142,10 +144,10 @@ static int efifb_probe(struct platform_device *dev)if (!screen_info.pages) screen_info.pages =1 ;if (!screen_info.lfb_base) { -printk (KERN_DEBUG "efifb: invalid framebuffer address\n" ); +pr_debug ("invalid framebuffer address\n" );return -ENODEV ; } -printk (KERN_INFO "efifb: probing for efifb\n" ); +pr_info ("probing for efifb\n" );/* just assume they're all unset if any are */ if (!screen_info.blue_size) {
@@ -193,14 +195,14 @@ static int efifb_probe(struct platform_device *dev) }else {/* We cannot make this fatal. Sometimes this comes from magic spaces our resource handlers simply don't know about */ -printk (KERN_WARNING -"efifb: cannot reserve video memory at 0x%lx\n" , +pr_warn ( +"cannot reserve video memory at 0x%lx\n" , efifb_fix.smem_start); } info =framebuffer_alloc (sizeof (u32) *16 , &dev->dev);if (!info) { -printk (KERN_ERR "efifb: cannot allocate framebuffer\n" ); +pr_err ("cannot allocate framebuffer\n" ); err = -ENOMEM ; goto err_release_mem; }
@@ -218,18 +220,18 @@ static int efifb_probe(struct platform_device *dev) info->screen_base = ioremap_wc(efifb_fix.smem_start,
efifb_fix.smem_len);
if (!info->screen_base) {
- printk(KERN_ERR "efifb: abort, cannot ioremap video memory "
+ pr_err("abort, cannot ioremap video memory "
"0x%x @ 0x%lx\n",
efifb_fix.smem_len, efifb_fix.smem_start);
err = -EIO;
goto err_release_fb;
}- printk(KERN_INFO "efifb: framebuffer at 0x%lx, mapped to 0x%p, "
+ pr_info("framebuffer at 0x%lx, mapped to 0x%p, "
"using %dk, total %dk\n",
efifb_fix.smem_start, info->screen_base,
size_remap/1024, size_total/1024);
- printk(KERN_INFO "efifb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
+ pr_info("mode is %dx%dx%d, linelength=%d, pages=%d\n",
efifb_defined.xres, efifb_defined.yres,
efifb_defined.bits_per_pixel, efifb_fix.line_length,
screen_info.pages);
@@ -237,7 +239,7 @@ static int efifb_probe(struct platform_device *dev)
efifb_defined.xres_virtual = efifb_defined.xres;
efifb_defined.yres_virtual = efifb_fix.smem_len /
efifb_fix.line_length;
- printk(KERN_INFO "efifb: scrolling: redraw\n");
+ pr_info("scrolling: redraw\n");
efifb_defined.yres_virtual = efifb_defined.yres;
/* some dummy values for timing to make fbset happy */
@@ -255,7 +257,7 @@ static int efifb_probe(struct platform_device *dev)
efifb_defined.transp.offset = screen_info.rsvd_pos;
efifb_defined.transp.length = screen_info.rsvd_size;- printk(KERN_INFO "efifb: %s: "
+ pr_info("%s: "
"size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",
"Truecolor",
screen_info.rsvd_size,
@@ -276,11 +278,11 @@ static int efifb_probe(struct platform_device *dev)
info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE;
if ((err = fb_alloc_cmap(&info->cmap, 256, 0)) < 0) {
- printk(KERN_ERR "efifb: cannot allocate colormap\n");
+ pr_err("cannot allocate colormap\n");
goto err_unmap;
}
if ((err = register_framebuffer(info)) < 0) {
- printk(KERN_ERR "efifb: cannot register framebuffer\n");
+ pr_err("cannot register framebuffer\n");
goto err_fb_dealoc;
}
fb_info(info, "%s frame buffer device\n", info->fix.id);--
1.9.3
-Parmeshwr
Quoted 186 lines · Joe Perches
Quoted 3 lines · Parmeshwr Prasad
This is a trivial patch:
I have replaced
printk()with respective pr_* functions.Hi.
A few suggestions:
o Add this #define before any include
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmto Strip the embedded "efifb: " prefixes from the formats
o Coalesce the formats
o Don't change KERN_<LEVEL> uses unnecessarily
If you do change logging levels, state why in the change log
o Align the multiline argumentsdiriveom rrs/video/fbdev/efifb.c
Quoted 1 line
diriveom rrs/video/fbdev/efifb.c renamed from drivers/video/fbdev/efifb.c +0
-0[]
diriveom rrs/video/fbdev/efifb.c static int efifb_probe(struct platform_device *dev) · line 145
Quoted 6 lines
diriveom rrs/video/fbdev/efifb.c renamed from drivers/video/fbdev/efifb.c +1
-1@@ -142,10 +142,10 @@ static int efifb_probe(struct platform_device *dev)if (!screen_info.pages) screen_info.pages =1 ;if (!screen_info.lfb_base) { -printk (KERN_DEBUG "efifb: invalid framebuffer address\n" ); +pr_err ("efifb: invalid framebuffer address\n" );Strip the "efifb: " prefix from all the pr_<level> uses
pr_err("invalid framebuffer address\n");diriveom rrs/video/fbdev/efifb.c static int efifb_probe(struct platform_device *dev) · line 198
Quoted 8 lines
diriveom rrs/video/fbdev/efifb.c renamed from drivers/video/fbdev/efifb.c +1
-1@@ -193,14 +193,14 @@ static int efifb_probe(struct platform_device *dev) }else {/* We cannot make this fatal. Sometimes this comes from magic spaces our resource handlers simply don't know about */ -printk (KERN_WARNING +pr_warn ("efifb: cannot reserve video memory at 0x%lx\n" , efifb_fix.smem_start);Move the format to the same line as
pr_warnpr_warn("cannot reserve video memory at 0x%lx\n",diriveom rrs/video/fbdev/efifb.c static int efifb_probe(struct platform_device *dev) · line 223
Quoted 8 lines
diriveom rrs/video/fbdev/efifb.c renamed from drivers/video/fbdev/efifb.c +1
-1@@ -218,18 +218,18 @@ static int efifb_probe(struct platform_device *dev) info->screen_base =ioremap_wc (efifb_fix.smem_start, efifb_fix.smem_len);if (!info->screen_base) { -printk (KERN_ERR "efifb: abort, cannot ioremap video memory " +pr_err ("efifb: abort, cannot ioremap video memory " "0x%x @ 0x%lx\n" , efifb_fix.smem_len, efifb_fix.smem_start);Coalesce the format and align the arguments
pr_err("abort, cannot ioremap video memory 0x%x @ 0x%lx\n" efifb_fix.smem_len, efifb_fix.smem_start);You should end up with something like:
--- drivers/video/fbdev/efifb.c | 57 +++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 30 deletions(-)drivers/video/fbdev/efifb.c +27
-30@@ -6,6 +6,8 @@* */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h> @@ -142,10 +144,10 @@ static int efifb_probe(struct platform_device *dev)if (!screen_info.pages) screen_info.pages =1 ;if (!screen_info.lfb_base) { -printk (KERN_DEBUG "efifb: invalid framebuffer address\n" ); +pr_debug ("invalid framebuffer address\n" );return -ENODEV ; } -printk (KERN_INFO "efifb: probing for efifb\n" ); +pr_info ("probing for efifb\n" );/* just assume they're all unset if any are */ if (!screen_info.blue_size) {@@ -193,14 +195,13 @@ static int efifb_probe(struct platform_device *dev) }else {/* We cannot make this fatal. Sometimes this comes from magic spaces our resource handlers simply don't know about */ -printk (KERN_WARNING -"efifb: cannot reserve video memory at 0x%lx\n" , +pr_warn ("cannot reserve video memory at 0x%lx\n" , efifb_fix.smem_start); } info =framebuffer_alloc (sizeof (u32) *16 , &dev->dev);if (!info) { -printk (KERN_ERR "efifb: cannot allocate framebuffer\n" ); +pr_err ("cannot allocate framebuffer\n" ); err = -ENOMEM ; goto err_release_mem; }@@ -218,26 +219,24 @@ static int efifb_probe(struct platform_device *dev) info->screen_base =ioremap_wc (efifb_fix.smem_start, efifb_fix.smem_len);if (!info->screen_base) { -printk (KERN_ERR "efifb: abort, cannot ioremap video memory " -"0x%x @ 0x%lx\n" , - efifb_fix.smem_len, efifb_fix.smem_start); +pr_err ("abort, cannot ioremap video memory 0x%x @ 0x%lx\n" , + efifb_fix.smem_len, efifb_fix.smem_start); err = -EIO ; goto err_release_fb; } -printk (KERN_INFO "efifb: framebuffer at 0x%lx, mapped to 0x%p, " -"using %dk, total %dk\n" , - efifb_fix.smem_start, info->screen_base, - size_remap/1024 , size_total/1024 ); -printk (KERN_INFO "efifb: mode is %dx%dx%d, linelength=%d, pages=%d\n" , - efifb_defined.xres, efifb_defined.yres, - efifb_defined.bits_per_pixel, efifb_fix.line_length, - screen_info.pages); +pr_info ("framebuffer at 0x%lx, mapped to 0x%p, using %dk, total %dk\n" , + efifb_fix.smem_start, info->screen_base, + size_remap /1024 , size_total /1024 ); +pr_info ("mode is %dx%dx%d, linelength=%d, pages=%d\n" , + efifb_defined.xres, efifb_defined.yres, + efifb_defined.bits_per_pixel, efifb_fix.line_length, + screen_info.pages); efifb_defined.xres_virtual = efifb_defined.xres; efifb_defined.yres_virtual = efifb_fix.smem_len / efifb_fix.line_length; -printk (KERN_INFO "efifb: scrolling: redraw\n" ); +pr_info ("scrolling: redraw\n" ); efifb_defined.yres_virtual = efifb_defined.yres;/* some dummy values for timing to make fbset happy */ @@ -255,17 +254,15 @@ static int efifb_probe(struct platform_device *dev) efifb_defined.transp.offset = screen_info.rsvd_pos; efifb_defined.transp.length = screen_info.rsvd_size; -printk (KERN_INFO "efifb: %s: " -"size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n" , -"Truecolor" , - screen_info.rsvd_size, - screen_info.red_size, - screen_info.green_size, - screen_info.blue_size, - screen_info.rsvd_pos, - screen_info.red_pos, - screen_info.green_pos, - screen_info.blue_pos); +pr_info ("Truecolor: size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n" , + screen_info.rsvd_size, + screen_info.red_size, + screen_info.green_size, + screen_info.blue_size, + screen_info.rsvd_pos, + screen_info.red_pos, + screen_info.green_pos, + screen_info.blue_pos); efifb_fix.ypanstep =0 ; efifb_fix.ywrapstep =0 ;@@ -276,11 +273,11 @@ static int efifb_probe(struct platform_device *dev) info->flags =FBINFO_FLAG_DEFAULT |FBINFO_MISC_FIRMWARE ;if ((err =fb_alloc_cmap (&info->cmap,256 ,0 )) <0 ) { -printk (KERN_ERR "efifb: cannot allocate colormap\n" ); +pr_err ("cannot allocate colormap\n" ); goto err_unmap; }if ((err =register_framebuffer (info)) <0 ) { -printk (KERN_ERR "efifb: cannot register framebuffer\n" ); +pr_err ("cannot register framebuffer\n" ); goto err_fb_dealoc; }fb_info (info,"%s frame buffer device\n" , info->fix.id);