drivers/video/: Clean up printk()s
Subsystems (2)
PATCH 1/1 drivers/video/: Clean up printk()s
From: James Nelson <[email protected]>
This patch adds KERN_ constants to all of the printk()'s that need them in drivers/video/
Signed-off-by James Nelson <[email protected]>
Signed-off-by Domen Puncer <[email protected]>
--- atafb.c | 6 - aty/mach64_ct.c | 22 ++---- aty/radeon_monitor.c | 6 - aty/radeon_pm.c | 4 - bw2.c | 2 cg3.c | 2 cg6.c | 2 cirrusfb.c | 21 +++--- clps711xfb.c | 2 console/fbcon.c | 2 console/mdacon.c | 4 - console/newport_con.c | 4 - cyber2000fb.c | 2 dnfb.c | 2 fbmem.c | 2 fbmon.c | 10 +-- ffb.c | 6 - fm2fb.c | 2 igafb.c | 12 +-- imsttfb.c | 5 - intelfb/intelfbhw.c | 152 +++++++++++++++++++++++------------------------ kyro/fbdev.c | 2 leo.c | 2 macfb.c | 14 ++-- matrox/matroxfb_base.c | 2 modedb.c | 2 neofb.c | 10 +-- p9100.c | 2 platinumfb.c | 6 - pm3fb.c | 2 pmag-ba-fb.c | 2 pmagb-b-fb.c | 2 pvr2fb.c | 4 - radeonfb.c | 63 ++++++++----------- retz3fb.c | 84 ++++++++++++------------- riva/fbdev.c | 13 ++-- savage/savagefb_driver.c | 35 ++++++---- sstfb.c | 2 sun3fb.c | 6 - tcx.c | 2 tdfxfb.c | 12 +-- virgefb.c | 46 +++++++------- w100fb.c | 8 +- 43 files changed, 296 insertions(+), 295 deletions(-)
drivers/video/atafb.c +3 -3
@@ -2732,7 +2732,7 @@ int __init atafb_init(void) } fbhw = &st_switch; atafb_ops.fb_setcolreg = &stste_setcolreg; -printk ("Cannot determine video hardware; defaulting to ST(e)\n" ); +pr_info ("Cannot determine video hardware; defaulting to ST(e)\n" );#else /* ATAFB_STE */ /* no default driver included */ /* Nobody will ever see this message :-) */
@@ -2809,13 +2809,13 @@ int __init atafb_init(void)if (register_framebuffer (&fb_info) <0 )return -EINVAL ; -printk ("Determined %dx%d, depth %d\n" , +pr_info ("Determined %dx%d, depth %d\n" , disp.var.xres, disp.var.yres, disp.var.bits_per_pixel);if ((disp.var.xres != disp.var.xres_virtual) || (disp.var.yres != disp.var.yres_virtual))printk (" virtual %dx%d\n" , disp.var.xres_virtual, disp.var.yres_virtual); -printk ("fb%d: %s frame buffer device, using %dK of video memory\n" , +pr_info ("fb%d: %s frame buffer device, using %dK of video memory\n" , fb_info.node, fb_info.modename, screen_len>>10 );/* TODO: This driver cannot be unloaded yet */
drivers/video/aty/mach64_ct.c +8 -14
@@ -196,7 +196,7 @@ static int aty_dsp_gt(const struct fb_in pll->dsp_on_off = (dsp_on <<16 ) + dsp_off; pll->dsp_config = (dsp_precision <<20 ) | (pll->dsp_loop_latency <<16 ) | dsp_xclks;#ifdef DEBUG -printk ("atyfb(%s): dsp_config 0x%08x, dsp_on_off 0x%08x\n" , +pr_debug ("atyfb(%s): dsp_config 0x%08x, dsp_on_off 0x%08x\n" , __FUNCTION__, pll->dsp_config, pll->dsp_on_off);#endif return 0 ;
@@ -226,7 +226,7 @@ static int aty_valid_pll_ct(const struct#ifdef DEBUG pllvclk = (1000000 *2 * pll->vclk_fb_div) / (par->ref_clk_per * pll->pll_ref_div); -printk ("atyfb(%s): pllvclk=%d MHz, vclk=%d MHz\n" , +pr_debug ("atyfb(%s): pllvclk=%d MHz, vclk=%d MHz\n" , __FUNCTION__, pllvclk, pllvclk / pll->vclk_post_div_real);#endif pll->pll_vclk_cntl =0x03 ;/* VCLK = PLL_VCLK/VCLKx_POST */
@@ -257,9 +257,7 @@ static u32 aty_pll_to_var_ct(const struc ret /= pll->ct.xres; }#endif -#ifdef DEBUG -printk ("atyfb(%s): calculated 0x%08X(%i)\n" , __FUNCTION__, ret, ret); -#endif +pr_debug ("atyfb(%s): calculated 0x%08X(%i)\n" , __FUNCTION__, ret, ret);return ret; }
@@ -270,17 +268,15 @@ void aty_set_pll_ct(const struct fb_infou8 tmp, tmp2; lcd_gen_cntrl =0 ; -#ifdef DEBUG -printk ("atyfb(%s): about to program:\n" +pr_debug ("atyfb(%s): about to program:\n" "pll_ext_cntl=0x%02x pll_gen_cntl=0x%02x pll_vclk_cntl=0x%02x\n" , __FUNCTION__, pll->ct.pll_ext_cntl, pll->ct.pll_gen_cntl, pll->ct.pll_vclk_cntl); -printk ("atyfb(%s): setting clock %lu for FeedBackDivider %i, ReferenceDivider %i, PostDivider %i(%i)\n" , +pr_debug ("atyfb(%s): setting clock %lu for FeedBackDivider %i, ReferenceDivider %i, PostDivider %i(%i)\n" , __FUNCTION__, par->clk_wr_offset, pll->ct.vclk_fb_div, pll->ct.pll_ref_div, pll->ct.vclk_post_div, pll->ct.vclk_post_div_real); -#endif #ifdef CONFIG_FB_ATY_GENERIC_LCD if (par->lcd_table !=0 ) {/* turn off LCD */
@@ -415,10 +411,8 @@ static int __init aty_init_pll_ct(const pll->ct.xclk_post_div -=1 ; } -#ifdef DEBUG -printk ("atyfb(%s): mclk_fb_mult=%d, xclk_post_div=%d\n" , +pr_debug ("atyfb(%s): mclk_fb_mult=%d, xclk_post_div=%d\n" , __FUNCTION__, pll->ct.mclk_fb_mult, pll->ct.xclk_post_div); -#endif memcntl =aty_ld_le32 (MEM_CNTL , par); trp = (memcntl &0x300 ) >>8 ;
@@ -528,7 +522,7 @@ static int __init aty_init_pll_ct(const#ifdef DEBUG pllmclk = (1000000 * pll->ct.mclk_fb_mult * pll->ct.mclk_fb_div) / (par->ref_clk_per * pll->ct.pll_ref_div); -printk ("atyfb(%s): pllmclk=%d MHz, xclk=%d MHz\n" , +pr_debug ("atyfb(%s): pllmclk=%d MHz, xclk=%d MHz\n" , __FUNCTION__, pllmclk, pllmclk / pll->ct.xclk_post_div_real);#endif
@@ -569,7 +563,7 @@ static int __init aty_init_pll_ct(const#ifdef DEBUG pllsclk = (1000000 *2 * sclk_fb_div) / (par->ref_clk_per * pll->ct.pll_ref_div); -printk ("atyfb(%s): use sclk, pllsclk=%d MHz, sclk=mclk=%d MHz\n" , +pr_debug ("atyfb(%s): use sclk, pllsclk=%d MHz, sclk=mclk=%d MHz\n" , __FUNCTION__, pllsclk, pllsclk / sclk_post_div_real);#endif /*
drivers/video/aty/radeon_monitor.c +3 -3
@@ -178,10 +178,10 @@ static int __devinit radeon_get_panel_infor (i=0 ; i<24 ; i++) stmp[i] =BIOS_IN8 (tmp+i+1 ); stmp[24 ] =0 ; -printk ("radeonfb: panel ID string: %s\n" , stmp); +pr_info ("radeonfb: panel ID string: %s\n" , stmp); rinfo->panel_info.xres =BIOS_IN16 (tmp +25 ); rinfo->panel_info.yres =BIOS_IN16 (tmp +27 ); -printk ("radeonfb: detected LVDS panel size from BIOS: %dx%d\n" , +pr_info ("radeonfb: detected LVDS panel size from BIOS: %dx%d\n" , rinfo->panel_info.xres, rinfo->panel_info.yres); rinfo->panel_info.pwr_delay =BIOS_IN16 (tmp +44 );
@@ -561,7 +561,7 @@ void __devinit radeon_probe_screens(stru ((rinfo->bios_seg && (INREG(BIOS_4_SCRATCH) & 4)) || (INREG(LVDS_GEN_CNTL) & LVDS_ON))) { rinfo->mon1_type =MT_LCD ; -printk ("Non-DDC laptop panel detected\n" ); +pr_info ("Non-DDC laptop panel detected\n" ); }if (rinfo->mon1_type ==MT_NONE ) rinfo->mon1_type =radeon_crt_is_connected (rinfo, rinfo->reversed_DAC);
drivers/video/aty/radeon_pm.c +2 -2
@@ -2722,10 +2722,10 @@ void radeonfb_pm_init(struct radeonfb_in rinfo->dynclk = dynclk;if (dynclk ==1 ) {radeon_pm_enable_dynamic_mode (rinfo); -printk ("radeonfb: Dynamic Clock Power Management enabled\n" ); +pr_info ("radeonfb: Dynamic Clock Power Management enabled\n" ); }else if (dynclk ==0 ) {radeon_pm_disable_dynamic_mode (rinfo); -printk ("radeonfb: Dynamic Clock Power Management disabled\n" ); +pr_info ("radeonfb: Dynamic Clock Power Management disabled\n" ); }/* Check if we can power manage on suspend/resume. We can do
drivers/video/bw2.c +1 -1
@@ -374,7 +374,7 @@ static void bw2_init_one(struct sbus_devlist_add (&all->list, &bw2_list); -printk ("bw2: bwtwo at %lx:%lx\n" , +pr_info ("bw2: bwtwo at %lx:%lx\n" , (long ) (sdev ? sdev->reg_addrs[0 ].which_io :0 ), (long ) all->par.physbase); }
drivers/video/cg3.c +1 -1
@@ -435,7 +435,7 @@ static void cg3_init_one(struct sbus_devlist_add (&all->list, &cg3_list); -printk ("cg3: %s at %lx:%lx\n" , +pr_info ("cg3: %s at %lx:%lx\n" , sdev->prom_name, (long ) sdev->reg_addrs[0 ].which_io, (long ) sdev->reg_addrs[0 ].phys_addr);
drivers/video/cg6.c +1 -1
@@ -747,7 +747,7 @@ static void cg6_init_one(struct sbus_devlist_add (&all->list, &cg6_list); -printk ("cg6: CGsix [%s] at %lx:%lx\n" , +pr_info ("cg6: CGsix [%s] at %lx:%lx\n" , all->info.fix.id, (long ) sdev->reg_addrs[0 ].which_io, (long ) sdev->reg_addrs[0 ].phys_addr);
drivers/video/cirrusfb.c +12 -9
@@ -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
@@ -703,14 +703,14 @@ static int cirrusfb_check_var(struct fb_ 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 ;
@@ -719,20 +719,20 @@ static int cirrusfb_check_var(struct fb_/* 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); }
@@ -2169,7 +2169,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 ) {
@@ -2354,7 +2354,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" );
@@ -2439,6 +2439,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);
@@ -2531,7 +2534,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 ;
drivers/video/clps711xfb.c +1 -1
@@ -385,7 +385,7 @@ int __init clps711xfb_init(void) clps7111fb_backlight_proc_entry =create_proc_entry ("backlight" ,0444 , &proc_root);if (clps7111fb_backlight_proc_entry ==NULL ) { -printk ("Couldn't create the /proc entry for the backlight.\n" ); +printk (KERN_ERR "Couldn't create the /proc entry for the backlight.\n" );return -EINVAL ; }
drivers/video/console/fbcon.c +1 -1
@@ -856,7 +856,7 @@ static const char *fbcon_startup(void)udelay (20 );if (ct ==1000 ) -printk +pr_info ("fbcon_startup: No VBL detected, using timer based cursor.\n" );free_irq (IRQ_MAC_VBL , fb_vbl_detect);
drivers/video/console/mdacon.c +2 -2
@@ -326,7 +326,7 @@ static const char __init *mdacon_startup mda_type_name ="MDA" ;if (!mda_detect ()) { -printk ("mdacon: MDA card not detected.\n" ); +pr_info ("mdacon: MDA card not detected.\n" );return NULL ; }
@@ -337,7 +337,7 @@ static const char __init *mdacon_startup/* cursor looks ugly during boot-up, so turn it off */ mda_set_cursor (mda_vram_len -1 ); -printk ("mdacon: %s with %ldK of memory detected.\n" , +pr_info ("mdacon: %s with %ldK of memory detected.\n" , mda_type_name, mda_vram_len/1024 );return "MDA-2" ;
drivers/video/console/newport_con.c +2 -2
@@ -231,7 +231,7 @@ void newport_get_screensize(void) newport_ysize += linetable[i +1 ]; } } -printk ("NG1: Screensize %dx%d\n" , newport_xsize, newport_ysize); +pr_info ("NG1: Screensize %dx%d\n" , newport_xsize, newport_ysize); }static void newport_get_revisions (void )
@@ -274,7 +274,7 @@ static void newport_get_revisions(void) bt445_rev = (npregs->set.dcbdata0.bybytes.b3 >>4 ) -0x0a ;#define L (a) (char)('A'+(a)) -printk +pr_info ("NG1: Revision %d, %d bitplanes, REX3 revision %c, VC2 revision %c, xmap9 revision %c, cmap revision %c, bt445 revision %c\n" , board_rev, bitplanes,L (rex3_rev),L (vc2_rev),L (xmap9_rev),L (cmap_rev ? (cmap_rev +1 ) :0 ),L (bt445_rev));
drivers/video/cyber2000fb.c +1 -1
@@ -1373,7 +1373,7 @@ static int __devinit cyberpro_common_pro err = -EINVAL ;if (!fb_find_mode (&cfb->fb.var, &cfb->fb,NULL ,NULL ,0 , &cyber2000fb_default_mode,8 )) { -printk ("%s: no valid mode found\n" , cfb->fb.fix.id); +printk (KERN_ERR "%s: no valid mode found\n" , cfb->fb.fix.id); goto failed; }
drivers/video/dnfb.c +1 -1
@@ -266,7 +266,7 @@ static int __devinit dnfb_probe(struct dout_8 (AP_CONTROL_2 ,S_DATA_PLN );out_be16 (AP_ROP_1 ,SWAP (0x3 )); -printk ("apollo frame buffer alive and kicking !\n" ); +pr_info ("apollo frame buffer initialized\n" );return err; }
drivers/video/fbmem.c +1 -1
@@ -1195,7 +1195,7 @@ fbmem_init(void)devfs_mk_dir ("fb" );if (register_chrdev (FB_MAJOR ,"fb" ,&fb_fops)) -printk ("unable to get major %d for fb devs\n" ,FB_MAJOR ); +printk (KERN_WARNING "unable to get major %d for fb devs\n" ,FB_MAJOR ); fb_class =class_simple_create (THIS_MODULE ,"graphics" );if (IS_ERR (fb_class)) {
drivers/video/fbmon.c +5 -5
@@ -43,7 +43,7 @@#undef DEBUG/* define this for verbose EDID parsing output */ #ifdef DEBUG -#define DPRINTK(fmt, args...) printk(fmt,## args) +#define DPRINTK(fmt, args...) pr_debug("%s(): ", fmt, __FUNCTION__, ## args)#else #define DPRINTK(fmt, args...)#endif
@@ -104,7 +104,7 @@ static int check_edid(unsigned char *edifor (i =0 ; i <ARRAY_SIZE (brokendb); i++) {if (!strncmp (manufacturer, brokendb[i].manufacturer,4 ) && brokendb[i].model == model) { -printk ("fbmon: The EDID Block of " +pr_info ("fbmon: The EDID Block of " "Manufacturer: %s Model: 0x%x is known to " "be broken,\n" , manufacturer, model); fix = brokendb[i].fix;
@@ -137,11 +137,11 @@ static void fix_edid(unsigned char *edidswitch (fix) {case FBMON_FIX_HEADER : -printk ("fbmon: trying a header reconstruct\n" ); +pr_info ("fbmon: trying a header reconstruct\n" );memcpy (edid, edid_v1_header,8 );break ;case FBMON_FIX_INPUT : -printk ("fbmon: trying to fix input type\n" ); +pr_info ("fbmon: trying to fix input type\n" ); b = edid +EDID_STRUCT_DISPLAY ; b[0 ] &= ~0x80 ; edid[127 ] +=0x80 ;
@@ -764,7 +764,7 @@ static void get_monspecs(unsigned char * specs->misc |=FB_MISC_1ST_DETAIL ; }if (c &0x01 ) { -printk (" Display is GTF capable\n" ); +DPRINTK (" Display is GTF capable\n" ); specs->gtf =1 ; } }
drivers/video/ffb.c +3 -3
@@ -934,12 +934,12 @@ static void ffb_init_one(int node, int pstruct all_info *all;if (prom_getproperty (node,"reg" , (void *) regs,sizeof (regs)) <=0 ) { -printk ("ffb: Cannot get reg device node property.\n" ); +printk (KERN_ERR "ffb: Cannot get reg device node property.\n" );return ; }if (ffb_apply_upa_parent_ranges (parent, ®s[0 ])) { -printk ("ffb: Cannot apply parent ranges to regs.\n" ); +printk (KERN_ERR "ffb: Cannot apply parent ranges to regs.\n" );return ; }
@@ -1026,7 +1026,7 @@ static void ffb_init_one(int node, int plist_add (&all->list, &ffb_list); -printk ("ffb: %s at %016lx type %d DAC %d\n" , +pr_info ("ffb: %s at %016lx type %d DAC %d\n" , ((all->par.flags &FFB_FLAG_AFB ) ?"AFB" :"FFB" ), regs[0 ].phys_addr, all->par.board_type, all->par.dac_rev); }
drivers/video/fm2fb.c +1 -1
@@ -288,7 +288,7 @@ static int __devinit fm2fb_probe(structzorro_release_device (z);return -EINVAL ; } -printk ("fb%d: %s frame buffer device\n" , info->node, fb_fix.id); +pr_info ("fb%d: %s frame buffer device\n" , info->node, fb_fix.id);return 0 ; }
drivers/video/igafb.c +6 -6
@@ -364,7 +364,7 @@ static int __init iga_init(struct fb_infif (register_framebuffer (info) <0 )return 0 ; -printk ("fb%d: %s frame buffer device at 0x%08lx [%dMB VRAM]\n" , +pr_info ("fb%d: %s frame buffer device at 0x%08lx [%dMB VRAM]\n" , info->node, info->fix.id, par->frame_buffer_phys, info->fix.smem_len >>20 );
@@ -406,7 +406,7 @@ int __init igafb_init(void) info =kmalloc (size,GFP_ATOMIC );if (!info) { -printk ("igafb_init: can't alloc fb_info\n" ); +printk (KERN_ERR "igafb_init: can't alloc fb_info\n" );return -ENOMEM ; }memset (info,0 , size);
@@ -415,13 +415,13 @@ int __init igafb_init(void)if ((addr = pdev->resource[0 ].start) ==0 ) { -printk ("igafb_init: no memory start\n" ); +printk (KERN_ERR "igafb_init: no memory start\n" );kfree (info);return -ENXIO ; }if ((info->screen_base =ioremap (addr,1024 *1024 *2 )) ==0 ) { -printk ("igafb_init: can't remap %lx[2M]\n" , addr); +printk (KERN_ERR "igafb_init: can't remap %lx[2M]\n" , addr);kfree (info);return -ENXIO ; }
@@ -454,7 +454,7 @@ int __init igafb_init(void) igafb_fix.mmio_start =0x30000000 ;/* XXX */ }if ((par->io_base = (int )ioremap (igafb_fix.mmio_start, igafb_fix.smem_len)) ==0 ) { -printk ("igafb_init: can't remap %lx[4K]\n" , igafb_fix.mmio_start); +printk (KERN_ERR "igafb_init: can't remap %lx[4K]\n" , igafb_fix.mmio_start);iounmap ((void *)info->screen_base);kfree (info);return -ENXIO ;
@@ -470,7 +470,7 @@ int __init igafb_init(void) par->mmap_map =kmalloc (4 *sizeof (*par->mmap_map),GFP_ATOMIC );if (!par->mmap_map) { -printk ("igafb_init: can't alloc mmap_map\n" ); +printk (KERN_ERR "igafb_init: can't alloc mmap_map\n" );iounmap ((void *)par->io_base);iounmap (info->screen_base);kfree (info);
drivers/video/imsttfb.c +3 -2
@@ -1413,7 +1413,8 @@ init_imstt(struct fb_info *info)if ((info->var.xres * info->var.yres) * (info->var.bits_per_pixel >>3 ) > info->fix.smem_len || !(compute_imstt_regvals (par, info->var.xres, info->var.yres))) { -printk ("imsttfb: %ux%ux%u not supported\n" , info->var.xres, info->var.yres, info->var.bits_per_pixel); +printk (KERN_ERR "imsttfb: %ux%ux%u not supported\n" , + info->var.xres, info->var.yres, info->var.bits_per_pixel);kfree (info);return ; }
@@ -1455,7 +1456,7 @@ init_imstt(struct fb_info *info) } tmp = (read_reg_le32 (par->dc_regs,SSTATUS ) &0x0f00 ) >>8 ; -printk ("fb%u: %s frame buffer; %uMB vram; chip version %u\n" , +pr_info ("fb%u: %s frame buffer; %uMB vram; chip version %u\n" , info->node, info->fix.id, info->fix.smem_len >>20 , tmp); }
drivers/video/intelfb/intelfbhw.c +76 -76
222 lines not on this page · raw message
drivers/video/kyro/fbdev.c +1 -1
@@ -746,7 +746,7 @@ static int __devinit kyrofb_probe(structif (register_framebuffer (info) <0 ) goto out_unmap; -printk ("fb%d: %s frame buffer device, at %dx%d@%d using %ldk/%ldk of VRAM\n" , +pr_info ("fb%d: %s frame buffer device, at %dx%d@%d using %ldk/%ldk of VRAM\n" , info->node, info->fix.id, info->var.xres, info->var.yres, info->var.bits_per_pixel, size >>10 , (unsigned long )info->fix.smem_len >>10 );
drivers/video/leo.c +1 -1
@@ -614,7 +614,7 @@ static void leo_init_one(struct sbus_devlist_add (&all->list, &leo_list); -printk ("leo: %s at %lx:%lx\n" , +pr_info ("leo: %s at %lx:%lx\n" , sdev->prom_name, (long ) sdev->reg_addrs[0 ].which_io, (long ) sdev->reg_addrs[0 ].phys_addr);
drivers/video/macfb.c +7 -7
@@ -639,9 +639,9 @@ void __init macfb_init(void)Mac */ fb_info.screen_base =ioremap (mac_bi_data.videoaddr, macfb_fix.smem_len); -printk ("macfb: framebuffer at 0x%08lx, mapped to 0x%p, size %dk\n" , +pr_info ("macfb: framebuffer at 0x%08lx, mapped to 0x%p, size %dk\n" , macfb_fix.smem_start, fb_info.screen_base, macfb_fix.smem_len/1024 ); -printk ("macfb: mode is %dx%dx%d, linelength=%d\n" , +pr_info ("macfb: mode is %dx%dx%d, linelength=%d\n" , macfb_defined.xres, macfb_defined.yres, macfb_defined.bits_per_pixel, macfb_fix.line_length);/*
@@ -653,7 +653,7 @@ void __init macfb_init(void) macfb_defined.height =PIXEL_TO_MM (macfb_defined.yres); macfb_defined.width =PIXEL_TO_MM (macfb_defined.xres); -printk ("macfb: scrolling: redraw\n" ); +pr_info ("macfb: scrolling: redraw\n" ); macfb_defined.yres_virtual = macfb_defined.yres;/* some dummy values for timing to make fbset happy */
@@ -689,7 +689,7 @@ void __init macfb_init(void) macfb_defined.green.length =5 ; macfb_defined.blue.offset =0 ; macfb_defined.blue.length =5 ; -printk ("macfb: directcolor: " +pr_info ("macfb: directcolor: " "size=1:5:5:5, shift=15:10:5:0\n" ); video_cmap_len =16 ;/* Should actually be FB_VISUAL_DIRECTCOLOR, but this
@@ -706,14 +706,14 @@ void __init macfb_init(void) macfb_defined.green.length =8 ; macfb_defined.blue.offset =0 ; macfb_defined.blue.length =8 ; -printk ("macfb: truecolor: " +pr_info ("macfb: truecolor: " "size=0:8:8:8, shift=0:16:8:0\n" ); video_cmap_len =16 ; macfb_fix.visual =FB_VISUAL_TRUECOLOR ;default : video_cmap_len =0 ; macfb_fix.visual =FB_VISUAL_MONO01 ; -printk ("macfb: unknown or unsupported bit depth: %d\n" , macfb_defined.bits_per_pixel); +printk (KERN_WARNING "macfb: unknown or unsupported bit depth: %d\n" , macfb_defined.bits_per_pixel);break ; }
@@ -962,7 +962,7 @@ void __init macfb_init(void)if (register_framebuffer (&fb_info) <0 )return ; -printk ("fb%d: %s frame buffer device\n" , +pr_info ("fb%d: %s frame buffer device\n" , fb_info.node, fb_info.fix.id); }
drivers/video/matrox/matroxfb_base.c +1 -1
@@ -1880,7 +1880,7 @@ static int initMatrox2(WPMINFO struct boif (register_framebuffer (&ACCESS_FBINFO (fbcon)) <0 ) { goto failVideoIO; } -printk ("fb%d: %s frame buffer device\n" , +pr_info ("fb%d: %s frame buffer device\n" ,ACCESS_FBINFO (fbcon.node),ACCESS_FBINFO (fbcon.fix.id));/* there is no console on this fb... but we have to initialize hardware
drivers/video/modedb.c +1 -1
@@ -24,7 +24,7 @@ ((v).xres == (x) && (v).yres == (y))#ifdef DEBUG -#define DPRINTK(fmt, args...) printk("modedb %s: " fmt, __FUNCTION__ , ## args) +#define DPRINTK(fmt, args...) pr_debug("modedb %s: " fmt, __FUNCTION__ , ## args)#else #define DPRINTK(fmt, args...)#endif
drivers/video/neofb.c +5 -5
@@ -252,7 +252,7 @@ static void neoCalcVCLK(const struct fb_ par->VCLK3Denominator = d_best;#ifdef NEOFB_DEBUG - printk("neoVCLK: f:%d NumLow=%d NumHi=%d Den=%d Df=%d\n", + printk(KERN_DEBUG "neoVCLK: f:%d NumLow=%d NumHi=%d Den=%d Df=%d\n", f_target >> 12, par->VCLK3NumeratorLow, par->VCLK3NumeratorHigh,
@@ -1716,13 +1716,13 @@ static int __devinit neo_map_mmio(structif (!request_mem_region (info->fix.mmio_start,MMIO_SIZE ,"memory mapped I/O" )) { -printk ("neofb: memory mapped IO in use\n" ); +printk (KERN_ERR "neofb: memory mapped IO in use\n" );return -EBUSY ; } par->mmio_vbase =ioremap (info->fix.mmio_start,MMIO_SIZE );if (!par->mmio_vbase) { -printk ("neofb: unable to map memory mapped IO\n" ); +printk (KERN_ERR "neofb: unable to map memory mapped IO\n" );release_mem_region (info->fix.mmio_start, info->fix.mmio_len);return -ENOMEM ;
@@ -1757,14 +1757,14 @@ static int __devinit neo_map_video(strucif (!request_mem_region (info->fix.smem_start, info->fix.smem_len,"frame buffer" )) { -printk ("neofb: frame buffer in use\n" ); +printk (KERN_WARNING "neofb: frame buffer in use\n" );return -EBUSY ; } info->screen_base =ioremap (info->fix.smem_start, info->fix.smem_len);if (!info->screen_base) { -printk ("neofb: unable to map screen memory\n" ); +printk (KERN_ERR "neofb: unable to map screen memory\n" );release_mem_region (info->fix.smem_start, info->fix.smem_len);return -ENOMEM ;
drivers/video/p9100.c +1 -1
@@ -326,7 +326,7 @@ static void p9100_init_one(struct sbus_dlist_add (&all->list, &p9100_list); -printk ("p9100: %s at %lx:%lx\n" , +pr_info ("p9100: %s at %lx:%lx\n" , sdev->prom_name, (long ) sdev->reg_addrs[0 ].which_io, (long ) sdev->reg_addrs[0 ].phys_addr);
drivers/video/platinumfb.c +3 -3
@@ -146,7 +146,7 @@ static int platinumfb_set_par (struct fb info->fix.visual = (pinfo->cmode ==CMODE_8 ) ?FB_VISUAL_PSEUDOCOLOR :FB_VISUAL_DIRECTCOLOR ; info->fix.line_length = vmode_attrs[pinfo->vmode-1 ].hres * (1 <<pinfo->cmode) + offset; -printk ("line_length: %x\n" , info->fix.line_length); +printk (KERN_DEBUG "line_length: %x\n" , info->fix.line_length);return 0 ; }
@@ -362,12 +362,12 @@ static int __devinit platinum_init_fb(st platinum_vram_reqd(default_vmode, default_cmode) > pinfo->total_vram) default_cmode--; -printk ("platinumfb: Using video mode %d and color mode %d.\n" , default_vmode, default_cmode); +pr_info ("platinumfb: Using video mode %d and color mode %d.\n" , default_vmode, default_cmode);/* Setup default var */ if (mac_vmode_to_var (default_vmode, default_cmode, &var) <0 ) {/* This shouldn't happen! */ -printk ("mac_vmode_to_var(%d, %d,) failed\n" , default_vmode, default_cmode); +printk (KERN_ERR "mac_vmode_to_var(%d, %d,) failed\n" , default_vmode, default_cmode); try_again: default_vmode =VMODE_640_480_60 ; default_cmode =CMODE_8 ;
drivers/video/pm3fb.c +1 -1
@@ -1576,7 +1576,7 @@ static void pm3fb_common_init(struct pm3pm3fb_write_mode (l_fb_info); -printk ("fb%d: %s, using %uK of video memory (%s)\n" , +pr_info ("fb%d: %s, using %uK of video memory (%s)\n" , l_fb_info->gen.info.node, permedia3_name, (u32) (l_fb_info->fb_size >>10 ), cardbase[l_fb_info->board_type].cardname);
drivers/video/pmag-ba-fb.c +1 -1
@@ -126,7 +126,7 @@ int __init pmagbafb_init_one(int slot)struct fb_info *info = &pmagba_fb_info[slot];struct display *disp = &pmagba_disp[slot]; -printk ("PMAG-BA framebuffer in slot %d\n" , slot); +pr_info ("PMAG-BA framebuffer in slot %d\n" , slot);/* * Framebuffer display memory base address and friends */
drivers/video/pmagb-b-fb.c +1 -1
@@ -126,7 +126,7 @@ int __init pmagbbfb_init_one(int slot)unsigned long base_addr =get_tc_base_addr (slot);struct fb_info *info = &pmagbb_fb_info[slot]; -printk ("PMAGB-BA framebuffer in slot %d\n" , slot); +pr_info ("PMAGB-BA framebuffer in slot %d\n" , slot);/* * Framebuffer display memory base address and friends */
drivers/video/pvr2fb.c +2 -2
@@ -818,10 +818,10 @@ static int __init pvr2fb_common_init(voi rev =fb_readl (par->mmio_base +0x04 ); -printk ("fb%d: %s (rev %ld.%ld) frame buffer device, using %ldk/%ldk of video memory\n" , +pr_info ("fb%d: %s (rev %ld.%ld) frame buffer device, using %ldk/%ldk of video memory\n" , fb_info->node, fb_info->fix.id, (rev >>4 ) &0x0f , rev &0x0f , modememused >>10 , (unsigned long )(fb_info->fix.smem_len >>10 )); - printk("fb%d: Mode %dx%d-%d pitch = %ld cable: %s video output: %s\n", + pr_info("fb%d: Mode %dx%d-%d pitch = %ld cable: %s video output: %s\n", fb_info->node, fb_info->var.xres, fb_info->var.yres, fb_info->var.bits_per_pixel, get_line_length(fb_info->var.xres, fb_info->var.bits_per_pixel),
drivers/video/radeonfb.c +29 -34
215 lines not on this page · raw message
drivers/video/retz3fb.c +42 -42
181 lines not on this page · raw message
drivers/video/riva/fbdev.c +7 -6
@@ -68,9 +68,10 @@* * ------------------------------------------------------------------------- */ #ifdef CONFIG_FB_RIVA_DEBUG -#define NVTRACE printk +#define DEBUG +#define NVTRACE pr_debug#else -#define NVTRACE if(0) printk +#define NVTRACE if(0) pr_debug#endif #define NVTRACE_ENTER (...) NVTRACE("%s START\n", __FUNCTION__)
@@ -79,7 +80,7 @@#ifdef CONFIG_FB_RIVA_DEBUG #define assert (expr) \ if(!(expr)) { \ - printk( "Assertion failed! %s,%s,%s,line=%d\n",\ + pr_debug( "Assertion failed! %s,%s,%s,line=%d\n",\ #expr,__FILE__,__FUNCTION__,__LINE__); \ BUG(); \ }
@@ -1779,7 +1780,7 @@ static int __devinit riva_get_EDID_i2c(sfor (i =0 ; i < par->bus; i++) {riva_probe_i2c_connector (par, i+1 , &par->EDID);if (par->EDID && !fb_parse_edid (par->EDID, &var)) { -printk (PFX "Found EDID Block from BUS %i\n" , i); +pr_info (PFX "Found EDID Block from BUS %i\n" , i);break ; } }
@@ -1828,10 +1829,10 @@ static void __devinit riva_get_EDID(struNVTRACE_ENTER ();#ifdef CONFIG_PPC_OF if (!riva_get_EDID_OF (info, pdev)) -printk (PFX "could not retrieve EDID from OF\n" ); +pr_info (PFX "could not retrieve EDID from OF\n" );#elif CONFIG_FB_RIVA_I2C if (!riva_get_EDID_i2c (info)) -printk (PFX "could not retrieve EDID from DDC/I2C\n" ); +pr_info (PFX "could not retrieve EDID from DDC/I2C\n" );#endif NVTRACE_LEAVE (); }
drivers/video/savage/savagefb_driver.c +21 -14
@@ -41,6 +41,8 @@* */ +#undef DEBUG +#include <linux/config.h> #include <linux/module.h> #include <linux/kernel.h>
@@ -474,7 +476,7 @@ static int common_calc_clock(long freq,return 0 ; } -#ifdef SAVAGEFB_DEBUG +#ifdef DEBUG /* This function is used to debug, it prints out the contents of s3 regs */ static void SavagePrintRegs (void )
@@ -483,27 +485,32 @@ static void SavagePrintRegs(void)int vgaCRIndex =0x3d4 ;int vgaCRReg =0x3d5 ; -printk (KERN_DEBUG "SR x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE " -"xF" ); +pr_debug ("SR x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF" );for ( i =0 ; i <0x70 ; i++ ) { -if ( !(i %16 ) ) -printk (KERN_DEBUG "\nSR%xx " , i >>4 ); +if ( !(i %16 ) ) { +printk ("\n" ); +pr_debug ("SR%xx " , i >>4 ); + }vga_out8 (0x3c4 , i ); -printk (KERN_DEBUG " %02x" ,vga_in8 (0x3c5 ) ); +printk (" %02x" ,vga_in8 (0x3c5 ) ); } +printk ("\n" ); -printk (KERN_DEBUG "\n\nCR x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC " -"xD xE xF" ); +pr_debug ("---BREAK---\n" ); +pr_debug ("CR x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF" );for ( i =0 ; i <0xB7 ; i++ ) { -if ( !(i %16 ) ) -printk (KERN_DEBUG "\nCR%xx " , i >>4 ); +if ( !(i %16 ) ) { +printk ("\n" ); +pr_debug ("CR%xx " , i >>4 ); + }vga_out8 ( vgaCRIndex, i ); -printk (KERN_DEBUG " %02x" ,vga_in8 (vgaCRReg) ); +pr_debug (" %02x" ,vga_in8 (vgaCRReg) ); } +printk ("\n" ); - printk(KERN_DEBUG "\n\n"); + pr_debug("---END---\n"); }#endif
@@ -1489,7 +1496,7 @@ static int __devinit savage_map_mmio (st par->mmio.vbase =ioremap (par->mmio.pbase, par->mmio.len);if (!par->mmio.vbase) { -printk ("savagefb: unable to map memory mapped IO\n" ); +printk (KERN_ERR "savagefb: unable to map memory mapped IO\n" );return -ENOMEM ; }else printk (KERN_INFO "savagefb: mapped io at %p\n",
@@ -1537,7 +1544,7 @@ static int __devinit savage_map_video (s par->video.vbase =ioremap (par->video.pbase, par->video.len);if (!par->video.vbase) { -printk ("savagefb: unable to map screen memory\n" ); +printk (KERN_ERR "savagefb: unable to map screen memory\n" );return -ENOMEM ; }else printk (KERN_INFO "savagefb: mapped framebuffer at %p, "
drivers/video/sstfb.c +1 -1
@@ -790,7 +790,7 @@ static int sstfb_ioctl(struct inode *inoreturn -EFAULT ;if (val > info->fix.smem_len) val = info->fix.smem_len; -printk ("filling %#x \n" , val); +printk (KERN_DEBUG "filling %#x \n" , val);for (p=0 ; p<val; p+=2 )writew (p >>6 , info->screen_base + p);return 0 ;
drivers/video/sun3fb.c +3 -3
@@ -645,7 +645,7 @@ sizechange:kfree (fb);return -EINVAL ; } -printk ("fb%d: %s\n" , fb->info.node, p); +pr_info ("fb%d: %s\n" , fb->info.node, p);return 0 ; }
@@ -667,14 +667,14 @@ int __init sun3fb_init(void)case FBTYPE_SUN3COLOR :case FBTYPE_SUN4COLOR :if (idprom->id_machtype != (SM_SUN3 |SM_3_60 )) { -printk ("sun3fb: cgthree/four only supported on 3/60\n" ); +printk (KERN_ERR "sun3fb: cgthree/four only supported on 3/60\n" );return -ENODEV ; } addr =CGFOUR_OBMEM_ADDR ;return sun3fb_init_fb (*(romvec->pv_fbtype), addr);default : -printk ("sun3fb: unsupported framebuffer\n" ); +printk (KERN_ERR "sun3fb: unsupported framebuffer\n" ); return -ENODEV; }#else
drivers/video/tcx.c +1 -1
@@ -462,7 +462,7 @@ static void tcx_init_one(struct sbus_devlist_add (&all->list, &tcx_list); - printk("tcx: %s at %lx:%lx, %s\n", + pr_info("tcx: %s at %lx:%lx, %s\n", sdev->prom_name, (long) sdev->reg_addrs[0].which_io, (long) sdev->reg_addrs[0].phys_addr,
drivers/video/tdfxfb.c +6 -6
@@ -4,7 +4,7 @@* * Author: Hannu Mallat <[email protected]> * -* Copyright © 1999 Hannu Mallat +* Copyright 1999 Hannu Mallat * All rights reserved * * Created : Thu Sep 23 18:17:43 1999, hmallat
@@ -1193,7 +1193,7 @@ static int __devinit tdfxfb_probe(struct tdfx_fix.mmio_len =pci_resource_len (pdev,0 ); default_par->regbase_virt =ioremap_nocache (tdfx_fix.mmio_start, tdfx_fix.mmio_len);if (!default_par->regbase_virt) { -printk ("fb: Can't remap %s register area.\n" , tdfx_fix.id); +printk (KERN_WARNING "fb: Can't remap %s register area.\n" , tdfx_fix.id); goto out_err; }
@@ -1205,7 +1205,7 @@ static int __devinit tdfxfb_probe(struct tdfx_fix.smem_start =pci_resource_start (pdev,1 );if (!(tdfx_fix.smem_len =do_lfb_size (default_par, pdev->device))) { -printk ("fb: Can't count %s memory.\n" , tdfx_fix.id); +printk (KERN_WARNING "fb: Can't count %s memory.\n" , tdfx_fix.id);release_mem_region (pci_resource_start (pdev,0 ),pci_resource_len (pdev,0 )); goto out_err;
@@ -1222,7 +1222,7 @@ static int __devinit tdfxfb_probe(struct info->screen_base =ioremap_nocache (tdfx_fix.smem_start, tdfx_fix.smem_len);if (!info->screen_base) { -printk ("fb: Can't remap %s framebuffer.\n" , tdfx_fix.id); +printk (KERN_WARNING "fb: Can't remap %s framebuffer.\n" , tdfx_fix.id);release_mem_region (pci_resource_start (pdev,1 ),pci_resource_len (pdev,1 )); release_mem_region(pci_resource_start(pdev, 0),
@@ -1242,7 +1242,7 @@ static int __devinit tdfxfb_probe(struct goto out_err; } -printk ("fb: %s memory = %dK\n" , tdfx_fix.id, tdfx_fix.smem_len >>10 ); +pr_info ("fb: %s memory = %dK\n" , tdfx_fix.id, tdfx_fix.smem_len >>10 ); tdfx_fix.ypanstep = nopan ?0 :1 ; tdfx_fix.ywrapstep = nowrap ?0 :1 ;
@@ -1285,7 +1285,7 @@ static int __devinit tdfxfb_probe(struct }if (register_framebuffer (info) <0 ) { -printk ("tdfxfb: can't register framebuffer\n" ); +printk (KERN_WARNING "tdfxfb: can't register framebuffer\n" );fb_dealloc_cmap (&info->cmap); goto out_err; }
drivers/video/virgefb.c +23 -23
109 lines not on this page · raw message
drivers/video/w100fb.c +4 -4
@@ -140,7 +140,7 @@ static ssize_t w100fb_reg_read(struct deunsigned long regs; regs =simple_strtoul (buf,NULL ,16 ); param =readl (remapped_regs + regs); -printk ("Read Register 0x%08lX: 0x%08lX\n" , regs, param); +printk (KERN_DEBUG "Read Register 0x%08lX: 0x%08lX\n" , regs, param);return count; }
@@ -153,7 +153,7 @@ static ssize_t w100fb_reg_write(struct dsscanf (buf,"%lx %lx" , ®s, ¶m);if (regs <=0x2000 ) { -printk ("Write Register 0x%08lX: 0x%08lX\n" , regs, param); +printk (KERN_DEBUG "Write Register 0x%08lX: 0x%08lX\n" , regs, param);writel (param, remapped_regs + regs); }
@@ -180,11 +180,11 @@ static ssize_t fastsysclk_store(struct d param =simple_strtoul (buf,NULL ,10 );if (param ==75 ) { -printk ("Set fastsysclk %d\n" , param); +printk (KERN_DEBUG "Set fastsysclk %d\n" , param); par->fastsysclk_mode = param;w100_set_fastsysclk (par->fastsysclk_mode); }else if (param ==100 ) { -printk ("Set fastsysclk %d\n" , param); +printk (KERN_DEBUG "Set fastsysclk %d\n" , param); par->fastsysclk_mode = param;w100_set_fastsysclk (par->fastsysclk_mode); }
--
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click