This patch adds KERN_ constants to all of the printk()'s that need them in drivers/video/cirrusfb.c Signed-off-by: James Nelson Signed-off-by: Domen Puncer --- kj-domen/drivers/video/cirrusfb.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff -puN drivers/video/cirrusfb.c~printk-drivers_video_cirrusfb drivers/video/cirrusfb.c --- kj/drivers/video/cirrusfb.c~printk-drivers_video_cirrusfb 2005-03-02 10:44:11.000000000 +0100 +++ kj-domen/drivers/video/cirrusfb.c 2005-03-02 10:44:11.000000000 +0100 @@ -93,7 +93,7 @@ #ifndef CIRRUSFB_NDEBUG #define assert(expr) \ if(!(expr)) { \ - printk( "Assertion failed! %s,%s,%s,line=%d\n",\ + printk(KERN_DEBUG "Assertion failed! %s,%s,%s,line=%d\n",\ #expr,__FILE__,__FUNCTION__,__LINE__); \ } #else @@ -701,14 +701,14 @@ int cirrusfb_check_var(struct fb_var_scr den = 1; break; /* 4 bytes per pixel */ default: - printk ("cirrusfb: mode %dx%dx%d rejected...color depth not supported.\n", + printk (KERN_WARNING "cirrusfb: mode %dx%dx%d rejected...color depth not supported.\n", var->xres, var->yres, var->bits_per_pixel); DPRINTK ("EXIT - EINVAL error\n"); return -EINVAL; } if (var->xres * nom / den * var->yres > cinfo->size) { - printk ("cirrusfb: mode %dx%dx%d rejected...resolution too high to fit into video memory!\n", + printk (KERN_WARNING "cirrusfb: mode %dx%dx%d rejected...resolution too high to fit into video memory!\n", var->xres, var->yres, var->bits_per_pixel); DPRINTK ("EXIT - EINVAL error\n"); return -EINVAL; @@ -717,20 +717,20 @@ int cirrusfb_check_var(struct fb_var_scr /* use highest possible virtual resolution */ if (var->xres_virtual == -1 && var->yres_virtual == -1) { - printk ("cirrusfb: using maximum available virtual resolution\n"); + pr_info ("cirrusfb: using maximum available virtual resolution\n"); for (i = 0; modes[i].xres != -1; i++) { if (modes[i].xres * nom / den * modes[i].yres < cinfo->size / 2) break; } if (modes[i].xres == -1) { - printk ("cirrusfb: could not find a virtual resolution that fits into video memory!!\n"); + printk (KERN_WARNING "cirrusfb: could not find a virtual resolution that fits into video memory!!\n"); DPRINTK ("EXIT - EINVAL error\n"); return -EINVAL; } var->xres_virtual = modes[i].xres; var->yres_virtual = modes[i].yres; - printk ("cirrusfb: virtual resolution set to maximum of %dx%d\n", + pr_info ("cirrusfb: virtual resolution set to maximum of %dx%d\n", var->xres_virtual, var->yres_virtual); } @@ -2167,7 +2167,7 @@ static unsigned int cirrusfb_get_memsize /* 64-bit DRAM data bus width; assume 2MB. Also indicates 2MB memory * on the 5430. */ case 0x18: mem = 2048 * 1024; break; - default: printk ("CLgenfb: Unknown memory size!\n"); + default: printk (KERN_WARNING "CLgenfb: Unknown memory size!\n"); mem = 1024 * 1024; } if (SRF & 0x80) { @@ -2352,7 +2352,7 @@ static void __devexit cirrusfb_cleanup ( unregister_framebuffer (info); fb_dealloc_cmap (&info->cmap); - printk ("Framebuffer unregistered\n"); + pr_info ("Framebuffer unregistered\n"); cinfo->unmap(cinfo); DPRINTK ("EXIT\n"); @@ -2437,6 +2437,9 @@ static int cirrusfb_pci_register (struct cinfo->size = board_size; cinfo->unmap = cirrusfb_pci_unmap; + printk(KERN_INFO "cirrusfb: %s board detected; ", + cirrusfb_board_info[btype].name); + printk (" RAM (%lu kB) at 0xx%lx, ", cinfo->size / KB_, board_addr); printk ("Cirrus Logic chipset on PCI bus\n"); pci_set_drvdata(pdev, info); @@ -2529,7 +2532,7 @@ static int cirrusfb_zorro_register(struc goto err_release_fb; } - printk (" RAM (%lu MB) at $%lx, ", board_size / MB_, board_addr); + pr_info (" RAM (%lu MB) at $%lx, ", board_size / MB_, board_addr); ret = -EIO; _