staging: sm750fb: clean up logging
Subsystems (2)
v5 cover staging: sm750fb: clean up logging
This series cleans up the logging in the sm750fb driver.
Changes since v4:
- Rebased on staging-testing to resolve conflicts with CamelCase renames (fixId, initParm) that landed since v4
- Dropped patch 2/3 (sm750.c dev_err conversion) as it was already applied from v4
Patch 1 removes all pr_info/pr_debug/pr_warn diagnostic prints from both sm750.c and sm750_hw.c.
Patch 2 converts the remaining pr_err() calls to dev_err() in sm750_hw.c for proper device context.
Artem Lytkin (2):
staging: sm750fb: remove debug and diagnostic prints
staging: sm750fb: convert logging to device-based in sm750_hw.c
drivers/staging/sm750fb/sm750.c | 76 +----------------------------- drivers/staging/sm750fb/sm750_hw.c | 26 ++-------- 2 files changed, 7 insertions(+), 95 deletions(-)
Signature · 1 line
2.43.0
PATCH v5 1/2 staging: sm750fb: remove debug and diagnostic prints
Remove all pr_info, pr_debug, and pr_warn calls that dump internal variable values, pointer addresses, and structure contents not useful for production use. This includes the complete fb_find_mode() result logging in lynxfb_set_fbinfo(), the CH7301 DVI chip status messages in hw_sm750_inithw(), and various debug prints throughout the driver.
--- drivers/staging/sm750fb/sm750.c | 76 +----------------------------- drivers/staging/sm750fb/sm750_hw.c | 18 +------ 2 files changed, 3 insertions(+), 91 deletions(-)
drivers/staging/sm750fb/sm750.c +2 -74
@@ -375,7 +375,6 @@ static int lynxfb_ops_set_par(struct fb_info *info) line_length = var->xres_virtual * var->bits_per_pixel /8 ; line_length =ALIGN (line_length, crtc->line_pad); fix->line_length = line_length; -pr_info ("fix->line_length = %d\n" , fix->line_length);/* * var->red,green,blue,transp are need to be set by driver
@@ -486,11 +485,6 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var, par = info->par; crtc = &par->crtc; -pr_debug ("check var:%dx%d-%d\n" , - var->xres, - var->yres, - var->bits_per_pixel); - ret =lynxfb_set_color_offsets (info);if (ret) {
@@ -582,7 +576,6 @@ static int lynxfb_ops_blank(int blank, struct fb_info *info)struct lynxfb_par *par;struct lynxfb_output *output; -pr_debug ("blank = %d.\n" , blank); par = info->par; output = &par->output; sm750_dev = par->dev;
@@ -627,7 +620,6 @@ static int sm750fb_set_drv(struct lynxfb_par *par) crtc->channel = sm750_primary; crtc->o_screen =0 ; crtc->v_screen = sm750_dev->pvMem; -pr_info ("use simul primary mode\n" );break ;case sm750_simul_sec: output->paths = sm750_pnc;
@@ -736,12 +728,6 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) lynx750_ext, NULL, vesa_modes, };int cdb[] = {ARRAY_SIZE (lynx750_ext),0 ,VESA_MODEDB_SIZE }; -static const char *const mdb_desc[] = { -"driver prepared modes" , -"kernel prepared default modedb" , -"kernel HELPERS prepared vesa_modes" , - }; -static const char *fix_id[2 ] = {"sm750_fb1" ,"sm750_fb2" , };
@@ -769,7 +755,6 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) crtc->cursor.mmio = sm750_dev->pvReg +0x800f0 + (int )crtc->channel *0x140 ; -pr_info ("crtc->cursor.mmio = %p\n" , crtc->cursor.mmio); crtc->cursor.max_h =64 ; crtc->cursor.max_w =64 ; crtc->cursor.size = crtc->cursor.max_h * crtc->cursor.max_w *2 /8 ;
@@ -803,47 +788,10 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) ret =fb_find_mode (var, info, g_fbmode[index], pdb[i], cdb[i],NULL ,8 ); -if (ret ==1 ) { -pr_info ("success! use specified mode:%s in %s\n" , - g_fbmode[index], - mdb_desc[i]); +if (ret ==1 || ret ==2 )break ; - }else if (ret ==2 ) { -pr_warn ("use specified mode:%s in %s,with an ignored refresh rate\n" , - g_fbmode[index], - mdb_desc[i]); -break ; - }else if (ret ==3 ) { -pr_warn ("wanna use default mode\n" ); -/*break;*/ - }else if (ret ==4 ) { -pr_warn ("fall back to any valid mode\n" ); - }else { -pr_warn ("ret = %d,fb_find_mode failed,with %s\n" , - ret, - mdb_desc[i]); - } } -/* some member of info->var had been set by fb_find_mode */ - -pr_info ("Member of info->var is :\n" -"xres=%d\n" -"yres=%d\n" -"xres_virtual=%d\n" -"yres_virtual=%d\n" -"xoffset=%d\n" -"yoffset=%d\n" -"bits_per_pixel=%d\n" -" ...\n" , - var->xres, - var->yres, - var->xres_virtual, - var->yres_virtual, - var->xoffset, - var->yoffset, - var->bits_per_pixel); -/* set par */ par->info = info;
@@ -853,7 +801,6 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) info->pseudo_palette = &par->pseudo_palette[0 ]; info->screen_base = crtc->v_screen; -pr_debug ("screen_base vaddr = %p\n" , info->screen_base); info->screen_size = line_length * var->yres_virtual;/* set info->fix */
@@ -867,7 +814,6 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)strscpy (fix->id, fix_id[index],sizeof (fix->id)); fix->smem_start = crtc->o_screen + sm750_dev->vidmem_start; -pr_info ("fix->smem_start = %lx\n" , fix->smem_start);/* * according to mmap experiment from user space application, * fix->mmio_len should not larger than virtual size
@@ -876,13 +822,10 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)* data into the bound over virtual size */ fix->smem_len = crtc->vidmem_size; -pr_info ("fix->smem_len = %x\n" , fix->smem_len); info->screen_size = fix->smem_len; fix->line_length = line_length; fix->mmio_start = sm750_dev->vidreg_start; -pr_info ("fix->mmio_start = %lx\n" , fix->mmio_start); fix->mmio_len = sm750_dev->vidreg_size; -pr_info ("fix->mmio_len = %x\n" , fix->mmio_len);lynxfb_set_visual_mode (info);
@@ -891,22 +834,12 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) var->accel_flags =0 ; var->vmode =FB_VMODE_NONINTERLACED ; -pr_debug ("#1 show info->cmap :\nstart=%d,len=%d,red=%p,green=%p,blue=%p,transp=%p\n" , - info->cmap.start, info->cmap.len, - info->cmap.red, info->cmap.green, info->cmap.blue, - info->cmap.transp); - ret =fb_alloc_cmap (&info->cmap,256 ,0 );if (ret <0 ) {dev_err (info->device,"Could not allocate memory for cmap.\n" ); goto exit; } -pr_debug ("#2 show info->cmap :\nstart=%d,len=%d,red=%p,green=%p,blue=%p,transp=%p\n" , - info->cmap.start, info->cmap.len, - info->cmap.red, info->cmap.green, info->cmap.blue, - info->cmap.transp); - exit:lynxfb_ops_check_var (var, info);return ret;
@@ -1133,12 +1066,8 @@ static int __init lynxfb_setup(char *options)int len;char *opt, *tmp; -if (!options || !*options) { -pr_warn ("no options.\n" ); +if (!options || !*options)return 0 ; - } - -pr_info ("options:%s\n" , options); len =strlen (options) +1 ; g_settings =kzalloc (len,GFP_KERNEL );
@@ -1175,7 +1104,6 @@ static int __init lynxfb_setup(char *options) }/* misc g_settings are transport to chip specific routines */ -pr_info ("parameter left for chip specific analysis:%s\n" , g_settings);return 0 ; }
drivers/staging/sm750fb/sm750_hw.c +1 -17
@@ -34,8 +34,6 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) sm750_dev->vidreg_start =pci_resource_start (pdev,1 ); sm750_dev->vidreg_size =SZ_2M ; -pr_info ("mmio phyAddr = %lx\n" , sm750_dev->vidreg_start); -/* * reserve the vidreg space of smi adaptor * if you do this, you need to add release region code
@@ -56,7 +54,6 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) ret = -EFAULT ; goto exit; } -pr_info ("mmio virtual addr = %p\n" , sm750_dev->pvReg); sm750_dev->accel.dpr_base = sm750_dev->pvReg +DE_BASE_ADDR_TYPE1 ; sm750_dev->accel.dp_port_base = sm750_dev->pvReg +DE_PORT_ADDR_TYPE1 ;
@@ -72,8 +69,6 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)* @ddk750_get_vm_size function can be safe. */ sm750_dev->vidmem_size =ddk750_get_vm_size (); -pr_info ("video memory phyAddr = %lx, size = %u bytes\n" , - sm750_dev->vidmem_start, sm750_dev->vidmem_size);/* reserve the vidmem space of smi adaptor */ sm750_dev->pvMem =
@@ -84,7 +79,6 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) ret = -EFAULT ; goto exit; } -pr_info ("video memory vaddr = %p\n" , sm750_dev->pvMem); exit:return ret; }
@@ -163,11 +157,9 @@ int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev)* The following register values for CH7301 are from * Chrontel app note and our experiment. */ -pr_info ("yes,CH7301 DVI chip found\n" );sm750_sw_i2c_write_reg (0xec ,0x1d ,0x16 );sm750_sw_i2c_write_reg (0xec ,0x21 ,0x9 );sm750_sw_i2c_write_reg (0xec ,0x49 ,0xC0 ); -pr_info ("okay,CH7301 DVI chip setup done\n" ); } }
@@ -192,14 +184,12 @@ int hw_sm750_output_set_mode(struct lynxfb_output *output,if (sm750_get_chip_type () !=SM750LE ) {if (channel == sm750_primary) { -pr_info ("primary channel\n" );if (output->paths & sm750_panel) disp_set |= do_LCD1_PRI;if (output->paths & sm750_crt) disp_set |= do_CRT_PRI; }else { -pr_info ("secondary channel\n" );if (output->paths & sm750_panel) disp_set |= do_LCD1_SEC;if (output->paths & sm750_crt)
@@ -215,7 +205,6 @@ int hw_sm750_output_set_mode(struct lynxfb_output *output,poke32 (DISPLAY_CONTROL_750LE , reg); } -pr_info ("ddk setlogicdispout done\n" );return ret; }
@@ -232,10 +221,8 @@ int hw_sm750_crtc_check_mode(struct lynxfb_crtc *crtc,case 16 :break ;case 32 : -if (sm750_dev->revid ==SM750LE_REVISION_ID ) { -pr_debug ("750le do not support 32bpp\n" ); +if (sm750_dev->revid ==SM750LE_REVISION_ID )return -EINVAL ; - }break ;default :return -EINVAL ;
@@ -302,7 +289,6 @@ int hw_sm750_crtc_set_mode(struct lynxfb_crtc *crtc,else clock =SECONDARY_PLL ; -pr_debug ("Request pixel clock = %lu\n" , modparm.pixel_clock); ret =ddk750_set_mode_timing (&modparm, clock);if (ret) {pr_err ("Set mode timing failed\n" );
@@ -431,12 +417,10 @@ int hw_sm750_set_blank(struct lynxfb_output *output, int blank)switch (blank) {case FB_BLANK_UNBLANK : -pr_debug ("flag = FB_BLANK_UNBLANK\n" ); dpms =SYSTEM_CTRL_DPMS_VPHP ; pps =PANEL_DISPLAY_CTRL_DATA ;break ;case FB_BLANK_NORMAL : -pr_debug ("flag = FB_BLANK_NORMAL\n" ); dpms =SYSTEM_CTRL_DPMS_VPHP ; crtdb =CRT_DISPLAY_CTRL_BLANK ;break ;
Signature · 1 line
2.43.0
PATCH v5 2/2 staging: sm750fb: convert logging to device-based in sm750_hw.c
In reply to Artem LytkinReplace pr_err() calls with dev_err() using &pdev->dev or &sm750_dev->pdev->dev to provide proper device context in log messages. This makes it easier to identify which device generated the message when multiple framebuffer devices are present.
--- drivers/staging/sm750fb/sm750_hw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/sm750fb/sm750_hw.c +4 -4
@@ -42,7 +42,7 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)*/ ret =pci_request_region (pdev,1 ,"sm750fb" );if (ret) { -pr_err ("Can not request PCI regions.\n" ); +dev_err (&pdev->dev,"Can not request PCI regions.\n" ); goto exit; }
@@ -50,7 +50,7 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) sm750_dev->pvReg =ioremap (sm750_dev->vidreg_start, sm750_dev->vidreg_size);if (!sm750_dev->pvReg) { -pr_err ("mmio failed\n" ); +dev_err (&pdev->dev,"mmio failed\n" ); ret = -EFAULT ; goto exit; }
@@ -75,7 +75,7 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)ioremap_wc (sm750_dev->vidmem_start, sm750_dev->vidmem_size);if (!sm750_dev->pvMem) {iounmap (sm750_dev->pvReg); -pr_err ("Map video memory failed\n" ); +dev_err (&pdev->dev,"Map video memory failed\n" ); ret = -EFAULT ; goto exit; }
@@ -291,7 +291,7 @@ int hw_sm750_crtc_set_mode(struct lynxfb_crtc *crtc, ret =ddk750_set_mode_timing (&modparm, clock);if (ret) { -pr_err ("Set mode timing failed\n" ); +dev_err (&sm750_dev->pdev->dev,"Set mode timing failed\n" ); goto exit; }
Signature · 1 line
2.43.0