mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
fbdev: vesafb: Use dev_* fn's instead printk
Family dev_* fn's will show device name, giving extra info to logs. Delete the prefix `vesafb:` from msg strings, not needed now, e.g.: vesa-framebuffer vesa-framebuffer.0: scrolling: redraw Signed-off-by: Javier Garcia <rampxxxx@gmail.com> Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
committed by
Helge Deller
parent
6c317ceefa
commit
b104df377d
@@ -314,8 +314,8 @@ static int vesafb_probe(struct platform_device *dev)
|
||||
#endif
|
||||
|
||||
if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
|
||||
printk(KERN_WARNING
|
||||
"vesafb: cannot reserve video memory at 0x%lx\n",
|
||||
dev_warn(&dev->dev,
|
||||
"cannot reserve video memory at 0x%lx\n",
|
||||
vesafb_fix.smem_start);
|
||||
/* We cannot make this fatal. Sometimes this comes from magic
|
||||
spaces our resource handlers simply don't know about */
|
||||
@@ -333,12 +333,12 @@ static int vesafb_probe(struct platform_device *dev)
|
||||
par->base = si->lfb_base;
|
||||
par->size = size_total;
|
||||
|
||||
printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
|
||||
dev_info(&dev->dev, "mode is %dx%dx%d, linelength=%d, pages=%d\n",
|
||||
vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel,
|
||||
vesafb_fix.line_length, si->pages);
|
||||
|
||||
if (si->vesapm_seg) {
|
||||
printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
|
||||
dev_info(&dev->dev, "protected mode interface info at %04x:%04x\n",
|
||||
si->vesapm_seg, si->vesapm_off);
|
||||
}
|
||||
|
||||
@@ -352,9 +352,10 @@ static int vesafb_probe(struct platform_device *dev)
|
||||
pmi_base = (unsigned short *)phys_to_virt(pmi_phys);
|
||||
pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
|
||||
pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
|
||||
printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
|
||||
dev_info(&dev->dev, "pmi: set display start = %p, set palette = %p\n",
|
||||
pmi_start, pmi_pal);
|
||||
if (pmi_base[3]) {
|
||||
printk(KERN_INFO "vesafb: pmi: ports = ");
|
||||
dev_info(&dev->dev, "pmi: ports = ");
|
||||
for (i = pmi_base[3]/2; pmi_base[i] != 0xffff; i++)
|
||||
printk("%x ", pmi_base[i]);
|
||||
printk("\n");
|
||||
@@ -365,14 +366,14 @@ static int vesafb_probe(struct platform_device *dev)
|
||||
* Rules are: we have to set up a descriptor for the requested
|
||||
* memory area and pass it in the ES register to the BIOS function.
|
||||
*/
|
||||
printk(KERN_INFO "vesafb: can't handle memory requests, pmi disabled\n");
|
||||
dev_info(&dev->dev, "can't handle memory requests, pmi disabled\n");
|
||||
ypan = pmi_setpal = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (vesafb_defined.bits_per_pixel == 8 && !pmi_setpal && !vga_compat) {
|
||||
printk(KERN_WARNING "vesafb: hardware palette is unchangeable,\n"
|
||||
dev_warn(&dev->dev, "hardware palette is unchangeable,\n"
|
||||
" colors may be incorrect\n");
|
||||
vesafb_fix.visual = FB_VISUAL_STATIC_PSEUDOCOLOR;
|
||||
}
|
||||
@@ -380,10 +381,10 @@ static int vesafb_probe(struct platform_device *dev)
|
||||
vesafb_defined.xres_virtual = vesafb_defined.xres;
|
||||
vesafb_defined.yres_virtual = vesafb_fix.smem_len / vesafb_fix.line_length;
|
||||
if (ypan && vesafb_defined.yres_virtual > vesafb_defined.yres) {
|
||||
printk(KERN_INFO "vesafb: scrolling: %s using protected mode interface, yres_virtual=%d\n",
|
||||
dev_info(&dev->dev, "scrolling: %s using protected mode interface, yres_virtual=%d\n",
|
||||
(ypan > 1) ? "ywrap" : "ypan",vesafb_defined.yres_virtual);
|
||||
} else {
|
||||
printk(KERN_INFO "vesafb: scrolling: redraw\n");
|
||||
dev_info(&dev->dev, "scrolling: redraw\n");
|
||||
vesafb_defined.yres_virtual = vesafb_defined.yres;
|
||||
ypan = 0;
|
||||
}
|
||||
@@ -410,7 +411,7 @@ static int vesafb_probe(struct platform_device *dev)
|
||||
vesafb_defined.bits_per_pixel;
|
||||
}
|
||||
|
||||
printk(KERN_INFO "vesafb: %s: "
|
||||
dev_info(&dev->dev, "%s: "
|
||||
"size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",
|
||||
(vesafb_defined.bits_per_pixel > 8) ?
|
||||
"Truecolor" : (vga_compat || pmi_setpal) ?
|
||||
@@ -453,14 +454,14 @@ static int vesafb_probe(struct platform_device *dev)
|
||||
}
|
||||
|
||||
if (!info->screen_base) {
|
||||
printk(KERN_ERR
|
||||
"vesafb: abort, cannot ioremap video memory 0x%x @ 0x%lx\n",
|
||||
dev_err(&dev->dev,
|
||||
"abort, cannot ioremap video memory 0x%x @ 0x%lx\n",
|
||||
vesafb_fix.smem_len, vesafb_fix.smem_start);
|
||||
err = -EIO;
|
||||
goto err_release_region;
|
||||
}
|
||||
|
||||
printk(KERN_INFO "vesafb: framebuffer at 0x%lx, mapped to 0x%p, "
|
||||
dev_info(&dev->dev, "framebuffer at 0x%lx, mapped to 0x%p, "
|
||||
"using %dk, total %dk\n",
|
||||
vesafb_fix.smem_start, info->screen_base,
|
||||
size_remap/1024, size_total/1024);
|
||||
|
||||
Reference in New Issue
Block a user