Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Javier Garcia and committed by
Helge Deller
b104df37 6c317cee

+15 -14
+15 -14
drivers/video/fbdev/vesafb.c
··· 314 314 #endif 315 315 316 316 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", 319 319 vesafb_fix.smem_start); 320 320 /* We cannot make this fatal. Sometimes this comes from magic 321 321 spaces our resource handlers simply don't know about */ ··· 333 333 par->base = si->lfb_base; 334 334 par->size = size_total; 335 335 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", 337 337 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, 338 338 vesafb_fix.line_length, si->pages); 339 339 340 340 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", 342 342 si->vesapm_seg, si->vesapm_off); 343 343 } 344 344 ··· 352 352 pmi_base = (unsigned short *)phys_to_virt(pmi_phys); 353 353 pmi_start = (void*)((char*)pmi_base + pmi_base[1]); 354 354 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); 356 357 if (pmi_base[3]) { 357 - printk(KERN_INFO "vesafb: pmi: ports = "); 358 + dev_info(&dev->dev, "pmi: ports = "); 358 359 for (i = pmi_base[3]/2; pmi_base[i] != 0xffff; i++) 359 360 printk("%x ", pmi_base[i]); 360 361 printk("\n"); ··· 366 365 * Rules are: we have to set up a descriptor for the requested 367 366 * memory area and pass it in the ES register to the BIOS function. 368 367 */ 369 - printk(KERN_INFO "vesafb: can't handle memory requests, pmi disabled\n"); 368 + dev_info(&dev->dev, "can't handle memory requests, pmi disabled\n"); 370 369 ypan = pmi_setpal = 0; 371 370 } 372 371 } 373 372 } 374 373 375 374 if (vesafb_defined.bits_per_pixel == 8 && !pmi_setpal && !vga_compat) { 376 - printk(KERN_WARNING "vesafb: hardware palette is unchangeable,\n" 375 + dev_warn(&dev->dev, "hardware palette is unchangeable,\n" 377 376 " colors may be incorrect\n"); 378 377 vesafb_fix.visual = FB_VISUAL_STATIC_PSEUDOCOLOR; 379 378 } ··· 381 380 vesafb_defined.xres_virtual = vesafb_defined.xres; 382 381 vesafb_defined.yres_virtual = vesafb_fix.smem_len / vesafb_fix.line_length; 383 382 if (ypan && vesafb_defined.yres_virtual > vesafb_defined.yres) { 384 - printk(KERN_INFO "vesafb: scrolling: %s using protected mode interface, yres_virtual=%d\n", 383 + dev_info(&dev->dev, "scrolling: %s using protected mode interface, yres_virtual=%d\n", 385 384 (ypan > 1) ? "ywrap" : "ypan",vesafb_defined.yres_virtual); 386 385 } else { 387 - printk(KERN_INFO "vesafb: scrolling: redraw\n"); 386 + dev_info(&dev->dev, "scrolling: redraw\n"); 388 387 vesafb_defined.yres_virtual = vesafb_defined.yres; 389 388 ypan = 0; 390 389 } ··· 411 410 vesafb_defined.bits_per_pixel; 412 411 } 413 412 414 - printk(KERN_INFO "vesafb: %s: " 413 + dev_info(&dev->dev, "%s: " 415 414 "size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n", 416 415 (vesafb_defined.bits_per_pixel > 8) ? 417 416 "Truecolor" : (vga_compat || pmi_setpal) ? ··· 454 453 } 455 454 456 455 if (!info->screen_base) { 457 - printk(KERN_ERR 458 - "vesafb: abort, cannot ioremap video memory 0x%x @ 0x%lx\n", 456 + dev_err(&dev->dev, 457 + "abort, cannot ioremap video memory 0x%x @ 0x%lx\n", 459 458 vesafb_fix.smem_len, vesafb_fix.smem_start); 460 459 err = -EIO; 461 460 goto err_release_region; 462 461 } 463 462 464 - printk(KERN_INFO "vesafb: framebuffer at 0x%lx, mapped to 0x%p, " 463 + dev_info(&dev->dev, "framebuffer at 0x%lx, mapped to 0x%p, " 465 464 "using %dk, total %dk\n", 466 465 vesafb_fix.smem_start, info->screen_base, 467 466 size_remap/1024, size_total/1024);