Skip to content

Commit b104df3

Browse files
rampxxxxhdeller
authored andcommitted
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>
1 parent 6c317ce commit b104df3

1 file changed

Lines changed: 15 additions & 14 deletions

File tree

drivers/video/fbdev/vesafb.c

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ static int vesafb_probe(struct platform_device *dev)
314314
#endif
315315

316316
if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
317-
printk(KERN_WARNING
318-
"vesafb: cannot reserve video memory at 0x%lx\n",
317+
dev_warn(&dev->dev,
318+
"cannot reserve video memory at 0x%lx\n",
319319
vesafb_fix.smem_start);
320320
/* We cannot make this fatal. Sometimes this comes from magic
321321
spaces our resource handlers simply don't know about */
@@ -333,12 +333,12 @@ static int vesafb_probe(struct platform_device *dev)
333333
par->base = si->lfb_base;
334334
par->size = size_total;
335335

336-
printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
336+
dev_info(&dev->dev, "mode is %dx%dx%d, linelength=%d, pages=%d\n",
337337
vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel,
338338
vesafb_fix.line_length, si->pages);
339339

340340
if (si->vesapm_seg) {
341-
printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
341+
dev_info(&dev->dev, "protected mode interface info at %04x:%04x\n",
342342
si->vesapm_seg, si->vesapm_off);
343343
}
344344

@@ -352,9 +352,10 @@ static int vesafb_probe(struct platform_device *dev)
352352
pmi_base = (unsigned short *)phys_to_virt(pmi_phys);
353353
pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
354354
pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
355-
printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
355+
dev_info(&dev->dev, "pmi: set display start = %p, set palette = %p\n",
356+
pmi_start, pmi_pal);
356357
if (pmi_base[3]) {
357-
printk(KERN_INFO "vesafb: pmi: ports = ");
358+
dev_info(&dev->dev, "pmi: ports = ");
358359
for (i = pmi_base[3]/2; pmi_base[i] != 0xffff; i++)
359360
printk("%x ", pmi_base[i]);
360361
printk("\n");
@@ -365,25 +366,25 @@ static int vesafb_probe(struct platform_device *dev)
365366
* Rules are: we have to set up a descriptor for the requested
366367
* memory area and pass it in the ES register to the BIOS function.
367368
*/
368-
printk(KERN_INFO "vesafb: can't handle memory requests, pmi disabled\n");
369+
dev_info(&dev->dev, "can't handle memory requests, pmi disabled\n");
369370
ypan = pmi_setpal = 0;
370371
}
371372
}
372373
}
373374

374375
if (vesafb_defined.bits_per_pixel == 8 && !pmi_setpal && !vga_compat) {
375-
printk(KERN_WARNING "vesafb: hardware palette is unchangeable,\n"
376+
dev_warn(&dev->dev, "hardware palette is unchangeable,\n"
376377
" colors may be incorrect\n");
377378
vesafb_fix.visual = FB_VISUAL_STATIC_PSEUDOCOLOR;
378379
}
379380

380381
vesafb_defined.xres_virtual = vesafb_defined.xres;
381382
vesafb_defined.yres_virtual = vesafb_fix.smem_len / vesafb_fix.line_length;
382383
if (ypan && vesafb_defined.yres_virtual > vesafb_defined.yres) {
383-
printk(KERN_INFO "vesafb: scrolling: %s using protected mode interface, yres_virtual=%d\n",
384+
dev_info(&dev->dev, "scrolling: %s using protected mode interface, yres_virtual=%d\n",
384385
(ypan > 1) ? "ywrap" : "ypan",vesafb_defined.yres_virtual);
385386
} else {
386-
printk(KERN_INFO "vesafb: scrolling: redraw\n");
387+
dev_info(&dev->dev, "scrolling: redraw\n");
387388
vesafb_defined.yres_virtual = vesafb_defined.yres;
388389
ypan = 0;
389390
}
@@ -410,7 +411,7 @@ static int vesafb_probe(struct platform_device *dev)
410411
vesafb_defined.bits_per_pixel;
411412
}
412413

413-
printk(KERN_INFO "vesafb: %s: "
414+
dev_info(&dev->dev, "%s: "
414415
"size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",
415416
(vesafb_defined.bits_per_pixel > 8) ?
416417
"Truecolor" : (vga_compat || pmi_setpal) ?
@@ -453,14 +454,14 @@ static int vesafb_probe(struct platform_device *dev)
453454
}
454455

455456
if (!info->screen_base) {
456-
printk(KERN_ERR
457-
"vesafb: abort, cannot ioremap video memory 0x%x @ 0x%lx\n",
457+
dev_err(&dev->dev,
458+
"abort, cannot ioremap video memory 0x%x @ 0x%lx\n",
458459
vesafb_fix.smem_len, vesafb_fix.smem_start);
459460
err = -EIO;
460461
goto err_release_region;
461462
}
462463

463-
printk(KERN_INFO "vesafb: framebuffer at 0x%lx, mapped to 0x%p, "
464+
dev_info(&dev->dev, "framebuffer at 0x%lx, mapped to 0x%p, "
464465
"using %dk, total %dk\n",
465466
vesafb_fix.smem_start, info->screen_base,
466467
size_remap/1024, size_total/1024);

0 commit comments

Comments
 (0)