Homogenize application output and fix sparse warnings.
cover Homogenize application output and fix sparse warnings.
This serie of patches mailnly try to homogenize module's output by removing some custom macros and printk calls, and using pr_* and dev_* functions instead. Also, they fix the definition of a fuction only in debug mode and fix some sparse warnings.
Miguel Gómez (8):
Staging: xgifb: reformat module parameter descriptions.
Staging: xgifb: remove DEBUGPRN() macro and its uses.
Staging: xgifb: remove DPRINTK() macro and replace it with pr_debug.
Staging: xgifb: define real dumpVGAReg() content only in DEBUG mode.
Staging: xgifb: Remove XGIFAIL() macro and its calls.
Staging: xgifb: Remove printk usage.
Staging: xgifb: Fix sparse warnings.
Staging: xgifb: Replace pr_* with dev_* when possible.
drivers/staging/xgifb/XGI_main.h | 2 - drivers/staging/xgifb/XGI_main_26.c | 189 ++++++++++++++++------------------- drivers/staging/xgifb/vb_init.c | 48 +-------- drivers/staging/xgifb/vb_setmode.c | 2 +- drivers/staging/xgifb/vb_util.c | 1 + 5 files changed, 92 insertions(+), 150 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/8 Staging: xgifb: reformat module parameter descriptions.
Signed-off-by Miguel Gómez <[email protected]>
--- drivers/staging/xgifb/XGI_main_26.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/xgifb/XGI_main_26.c +8 -8
@@ -2297,23 +2297,23 @@ static struct pci_driver xgifb_driver = {module_param (mode, charp,0 );MODULE_PARM_DESC (mode, -"\nSelects the desired default display mode in the format XxYxDepth,\n" -"eg. 1024x768x16.\n" ); +"Selects the desired default display mode in the format XxYxDepth " +"(eg. 1024x768x16)." );module_param (forcecrt2type, charp,0 );MODULE_PARM_DESC (forcecrt2type, -"\nForce the second display output type. Possible values are NONE,\n" -"LCD, TV, VGA, SVIDEO or COMPOSITE.\n" ); +"Force the second display output type. Possible values are NONE, " +"LCD, TV, VGA, SVIDEO or COMPOSITE." );module_param (vesa, int,0 );MODULE_PARM_DESC (vesa, -"\nSelects the desired default display mode by VESA mode number, eg.\n" -"0x117.\n" ); +"Selects the desired default display mode by VESA mode number " +"(eg. 0x117)." );module_param (filter, int,0 );MODULE_PARM_DESC (filter, -"\nSelects TV flicker filter type (only for systems with a SiS301 video bridge).\n" -"(Possible values 0-7, default: [no filter])\n" ); +"Selects TV flicker filter type (only for systems with a SiS301 video bridge). " +"Possible values 0-7. Default: [no filter])." );static int __init xgifb_init (void ) {
Signature · 1 line
1.7.9.5
PATCH 2/8 Staging: xgifb: remove DEBUGPRN() macro and its uses.
In reply to Miguel GómezRemove DEBUGPRN() macro which is defined as empty.
Signed-off-by Miguel Gómez <[email protected]>
--- drivers/staging/xgifb/XGI_main_26.c | 13 ------------- 1 file changed, 13 deletions(-)
drivers/staging/xgifb/XGI_main_26.c +0 -13
@@ -117,12 +117,6 @@ static inline void dumpVGAReg(void) }#endif -#if 1 -#define DEBUGPRN (x) -#else -#define DEBUGPRN (x) pr_info(x "\n"); -#endif -/* --------------- Hardware Access Routines -------------------------- */ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
@@ -1054,7 +1048,6 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,int old_mode;/* unsigned char reg, reg1; */ -DEBUGPRN ("Inside do_set_var" );/* printk(KERN_DEBUG "XGIfb:var->yres=%d, var->upper_margin=%d, var->lower_margin=%d, var->vsync_len=%d\n", var->yres, var->upper_margin, var->lower_margin, var->vsync_len); */ info->var.xres_virtual = var->xres_virtual;
@@ -1199,7 +1192,6 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive, } }XGIfb_bpp_to_var (xgifb_info, var);/*update ARGB info*/ -DEBUGPRN ("End of do_set_var" );dumpVGAReg ();return 0 ;
@@ -1321,7 +1313,6 @@ static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con, {struct xgifb_video_info *xgifb_info = info->par; -DEBUGPRN ("inside get_fix" );memset (fix,0 ,sizeof (struct fb_fix_screeninfo ));strncpy (fix->id,"XGI" ,sizeof (fix->id) -1 );
@@ -1352,7 +1343,6 @@ static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con, fix->mmio_len = xgifb_info->mmio_size; fix->accel =FB_ACCEL_SIS_XABRE ; -DEBUGPRN ("end of get_fix" );return 0 ; }
@@ -1379,8 +1369,6 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)int found_mode =0 ;int refresh_rate, search_idx; -DEBUGPRN ("Inside check_var" ); -if ((var->vmode &FB_VMODE_MASK ) ==FB_VMODE_NONINTERLACED ) { vtotal = var->upper_margin + var->yres + var->lower_margin + var->vsync_len;
@@ -1511,7 +1499,6 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) var->blue.msb_right = var->transp.offset = var->transp.length = var->transp.msb_right =0 ; -DEBUGPRN ("end of check_var" );return 0 ; }
Signature · 1 line
1.7.9.5
PATCH 3/8 Staging: xgifb: remove DPRINTK() macro and replace it with pr_debug.
In reply to Miguel GómezSigned-off-by Miguel Gómez <[email protected]>
--- drivers/staging/xgifb/XGI_main_26.c | 42 +++++++++++++++-------------------- 1 file changed, 18 insertions(+), 24 deletions(-)
drivers/staging/xgifb/XGI_main_26.c +18 -24
@@ -33,12 +33,6 @@ static unsigned int refresh_rate;#undef XGIFBDEBUG#ifdef XGIFBDEBUG -#define DPRINTK(fmt, args...) pr_debug("%s: " fmt, __func__ , ## args) -#else -#define DPRINTK(fmt, args...) -#endif - -#ifdef XGIFBDEBUG static void dumpVGAReg (void ) {u8 i, reg;
@@ -662,8 +656,8 @@ static u8 XGIfb_search_refresh_rate(struct xgifb_video_info *xgifb_info,break ; }else if (XGIfb_vrate[i].refresh > rate) {if ((XGIfb_vrate[i].refresh - rate) <=3 ) { -DPRINTK ("XGIfb: Adjusting rate from %d up to %d\n" , - rate, XGIfb_vrate[i].refresh); +pr_debug ("XGIfb: Adjusting rate from %d up to %d\n" , + rate, XGIfb_vrate[i].refresh); xgifb_info->rate_idx = XGIfb_vrate[i].idx; xgifb_info->refresh_rate =
@@ -671,8 +665,8 @@ static u8 XGIfb_search_refresh_rate(struct xgifb_video_info *xgifb_info, }else if (((rate - XGIfb_vrate[i -1 ].refresh) <=2 ) && (XGIfb_vrate[i].idx !=1 )) { -DPRINTK ("XGIfb: Adjusting rate from %d down to %d\n" , - rate, XGIfb_vrate[i-1 ].refresh); +pr_debug ("XGIfb: Adjusting rate from %d down to %d\n" , + rate, XGIfb_vrate[i-1 ].refresh); xgifb_info->rate_idx = XGIfb_vrate[i -1 ].idx; xgifb_info->refresh_rate =
@@ -680,8 +674,8 @@ static u8 XGIfb_search_refresh_rate(struct xgifb_video_info *xgifb_info, }break ; }else if ((rate - XGIfb_vrate[i].refresh) <=2 ) { -DPRINTK ("XGIfb: Adjusting rate from %d down to %d\n" , - rate, XGIfb_vrate[i].refresh); +pr_debug ("XGIfb: Adjusting rate from %d down to %d\n" , + rate, XGIfb_vrate[i].refresh); xgifb_info->rate_idx = XGIfb_vrate[i].idx;break ; }
@@ -995,15 +989,15 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info) }if ((filter >=0 ) && (filter <=7 )) { -DPRINTK ("FilterTable[%d]-%d: %02x %02x %02x %02x\n" , - filter_tb, filter, - XGI_TV_filter[filter_tb]. +pr_debug ("FilterTable[%d]-%d: %02x %02x %02x %02x\n" , + filter_tb, filter, + XGI_TV_filter[filter_tb]. filter[filter][0 ], - XGI_TV_filter[filter_tb]. + XGI_TV_filter[filter_tb]. filter[filter][1 ], - XGI_TV_filter[filter_tb]. + XGI_TV_filter[filter_tb]. filter[filter][2 ], - XGI_TV_filter[filter_tb]. + XGI_TV_filter[filter_tb]. filter[filter][3 ] ); xgifb_reg_set(
@@ -1064,7 +1058,7 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive, }if (!htotal || !vtotal) { -DPRINTK ("XGIfb: Invalid 'var' information\n" ); +pr_debug ("XGIfb: Invalid 'var' information\n" );return -EINVAL ; }pr_debug ("var->pixclock=%d, htotal=%d, vtotal=%d\n" , var->pixclock, htotal, vtotal);
@@ -1140,11 +1134,11 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,XGIfb_post_setmode (xgifb_info); -DPRINTK ("XGIfb: Set new mode: %dx%dx%d-%d\n" , - XGIbios_mode[xgifb_info->mode_idx].xres, - XGIbios_mode[xgifb_info->mode_idx].yres, - XGIbios_mode[xgifb_info->mode_idx].bpp, - xgifb_info->refresh_rate); +pr_debug ("XGIfb: Set new mode: %dx%dx%d-%d\n" , + XGIbios_mode[xgifb_info->mode_idx].xres, + XGIbios_mode[xgifb_info->mode_idx].yres, + XGIbios_mode[xgifb_info->mode_idx].bpp, + xgifb_info->refresh_rate); xgifb_info->video_bpp = XGIbios_mode[xgifb_info->mode_idx].bpp; xgifb_info->video_vwidth = info->var.xres_virtual;
Signature · 1 line
1.7.9.5
Re: [PATCH 3/8] Staging: xgifb: remove DPRINTK() macro and replace it with pr_debug.
drivers/staging/xgifb/XGI_main_26.c static u8 XGIfb_search_refresh_rate(struct xgifb_video_info *xgifb_info, · line 660
Quoted 6 lines · Miguel Gómez
drivers/staging/xgifb/XGI_main_26.c +2
-2}else if (XGIfb_vrate[i].refresh > rate) {if ((XGIfb_vrate[i].refresh - rate) <=3 ) { -DPRINTK ("XGIfb: Adjusting rate from %d up to %d\n" , - rate, XGIfb_vrate[i].refresh); +pr_debug ("XGIfb: Adjusting rate from %d up to %d\n" , + rate, XGIfb_vrate[i].refresh);
This file already has a pr_fmt set so if you wanted, you could just remove the "XGIfb: ". This was already there in the original code so don't resend. But if you want to send another patch which removes them that would be grand.
regards,
dan carpenter
PATCH 4/8 Staging: xgifb: define real dumpVGAReg() content only in DEBUG mode.
In reply to Miguel GómezDefine real content of dumpVGAReg() only in debug mode. Remove old condition.
Signed-off-by Miguel Gómez <[email protected]>
--- drivers/staging/xgifb/XGI_main_26.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/xgifb/XGI_main_26.c +1 -3
@@ -30,9 +30,7 @@ static unsigned int refresh_rate;/* -------------------- Macro definitions ---------------------------- */ -#undef XGIFBDEBUG - -#ifdef XGIFBDEBUG +#ifdef DEBUG static void dumpVGAReg (void ) {u8 i, reg;
Signature · 1 line
1.7.9.5
PATCH 5/8 Staging: xgifb: Remove XGIFAIL() macro and its calls.
In reply to Miguel GómezXGIFAIL() prints a message and returns a value, but it's used only in one place. Better remove it and replace the call with the macro content.
Signed-off-by Miguel Gómez <[email protected]>
--- drivers/staging/xgifb/XGI_main.h | 2 -- drivers/staging/xgifb/XGI_main_26.c | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/xgifb/XGI_main.h +0 -2
@@ -4,8 +4,6 @@#include "XGIfb.h" #include "vb_def.h" -#define XGIFAIL (x) do { printk(x "\n"); return -EINVAL; } while (0) -#ifndef PCI_DEVICE_ID_XGI_42 #define PCI_DEVICE_ID_XGI_42 0x042#endif
drivers/staging/xgifb/XGI_main_26.c +4 -2
@@ -1376,8 +1376,10 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) vtotal = var->upper_margin + var->yres + var->lower_margin + var->vsync_len; -if (!(htotal) || !(vtotal)) -XGIFAIL ("XGIfb: no valid timing data" ); +if (!(htotal) || !(vtotal)) { +pr_debug ("XGIfb: no valid timing data\n" ); +return -EINVAL ; + }if (var->pixclock && htotal && vtotal) { drate =1000000000 / var->pixclock;
Signature · 1 line
1.7.9.5
Re: [PATCH 5/8] Staging: xgifb: Remove XGIFAIL() macro and its calls.
drivers/staging/xgifb/XGI_main_26.c static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) · line 1379
Quoted 9 lines · Miguel Gómez
drivers/staging/xgifb/XGI_main_26.c +1
-2@@ -1376,8 +1376,10 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) vtotal = var->upper_margin + var->yres + var->lower_margin + var->vsync_len; -if (!(htotal) || !(vtotal)) -XGIFAIL ("XGIfb: no valid timing data" ); +if (!(htotal) || !(vtotal)) {
Don't resend this, but next time feel free to write this like:
if (!htotal || !vtotal) {We do have a one change per patch rule but tiny formatting things like that don't count as a change.
regards,
dan carpenter
Quoted 6 lines
drivers/staging/xgifb/XGI_main_26.c +3
-0+pr_debug ("XGIfb: no valid timing data\n" ); +return -EINVAL ; + }if (var->pixclock && htotal && vtotal) { drate =1000000000 / var->pixclock;
Re: [PATCH 5/8] Staging: xgifb: Remove XGIFAIL() macro and its calls.
Quoted 10 lines
drivers/staging/xgifb/XGI_main_26.c static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) · line 1379
Quoted 3 lines
drivers/staging/xgifb/XGI_main_26.c +1
-2-if (!(htotal) || !(vtotal)) -XGIFAIL ("XGIfb: no valid timing data" ); +if (!(htotal) || !(vtotal)) {Don't resend this, but next time feel free to write this like:
if (!htotal || !vtotal) {We do have a one change per patch rule but tiny formatting things like that don't count as a change.
Sure. I'll write it down together with your other comment to my next round of patches ;)
Regards!
Signature · 2 lines
Miguel Gómez Igalia - http://www.igalia.com
PATCH 6/8 Staging: xgifb: Remove printk usage.
In reply to Miguel GómezReplace meaninful printks with pr_debug and remove useless ones.
Signed-off-by Miguel Gómez <[email protected]>
--- drivers/staging/xgifb/XGI_main_26.c | 36 ++++++++++----------------- drivers/staging/xgifb/vb_init.c | 47 ++--------------------------------- 2 files changed, 15 insertions(+), 68 deletions(-)
drivers/staging/xgifb/XGI_main_26.c +13 -23
@@ -69,37 +69,37 @@ static void dumpVGAReg(void)for (i =0 ; i <0x4f ; i++) { reg =xgifb_reg_get (XGISR , i); -printk ("\no 3c4 %x" , i); -printk ("\ni 3c5 => %x" , reg); +pr_debug ("\no 3c4 %x" , i); +pr_debug ("\ni 3c5 => %x" , reg); }for (i =0 ; i <0xF0 ; i++) { reg =xgifb_reg_get (XGICR , i); -printk ("\no 3d4 %x" , i); -printk ("\ni 3d5 => %x" , reg); +pr_debug ("\no 3d4 %x" , i); +pr_debug ("\ni 3d5 => %x" , reg); }/* xgifb_reg_set(XGIPART1,0x2F,1); for (i=1; i < 0x50; i++) { reg = xgifb_reg_get(XGIPART1, i); -printk("\no d004 %x", i); -printk("\ni d005 => %x", reg); +pr_debug("\no d004 %x", i); +pr_debug("\ni d005 => %x", reg); } for (i=0; i < 0x50; i++) { reg = xgifb_reg_get(XGIPART2, i); -printk("\no d010 %x", i); -printk("\ni d011 => %x", reg); +pr_debug("\no d010 %x", i); +pr_debug("\ni d011 => %x", reg); } for (i=0; i < 0x50; i++) { reg = xgifb_reg_get(XGIPART3, i); -printk("\no d012 %x",i); -printk("\ni d013 => %x",reg); +pr_debug("\no d012 %x",i); +pr_debug("\ni d013 => %x",reg); } for (i=0; i < 0x50; i++) { reg = xgifb_reg_get(XGIPART4, i); -printk("\no d014 %x",i); -printk("\ni d015 => %x",reg); +pr_debug("\no d014 %x",i); +pr_debug("\ni d015 => %x",reg); } */ }
@@ -1040,8 +1040,6 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,int old_mode;/* unsigned char reg, reg1; */ -/* printk(KERN_DEBUG "XGIfb:var->yres=%d, var->upper_margin=%d, var->lower_margin=%d, var->vsync_len=%d\n", var->yres, var->upper_margin, var->lower_margin, var->vsync_len); */ - info->var.xres_virtual = var->xres_virtual; info->var.yres_virtual = var->yres_virtual; info->var.bits_per_pixel = var->bits_per_pixel;
@@ -1194,8 +1192,6 @@ static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)struct xgifb_video_info *xgifb_info = info->par;unsigned int base; -/* printk("Inside pan_var"); */ - base = var->yoffset * info->var.xres_virtual + var->xoffset;/* calculate base bpp dep. */
@@ -1229,7 +1225,6 @@ static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)0x7F , ((base >> 24) & 0x01) << 7); } -/* printk("End of pan_var"); */ return 0 ; }
@@ -1342,12 +1337,10 @@ static int XGIfb_set_par(struct fb_info *info) {int err; -/* printk("XGIfb: inside set_par\n"); */ err =XGIfb_do_set_var (&info->var,1 , info);if (err)return err;XGIfb_get_fix (&info->fix,-1 , info); -/* printk("XGIfb: end of set_par\n"); */ return 0 ; }
@@ -1501,8 +1494,6 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var, {int err; -/* printk("\nInside pan_display:\n"); */ -if (var->xoffset > (info->var.xres_virtual - info->var.xres))return -EINVAL ;if (var->yoffset > (info->var.yres_virtual - info->var.yres))
@@ -1529,7 +1520,6 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var,else info->var.vmode &= ~FB_VMODE_YWRAP ; -/* printk("End of pan_display\n"); */ return 0 ; }
@@ -1986,7 +1976,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,/* else if (reg >= 0xB0) { hw_info->ujVBChipID = VB_CHIP_301B; reg1 = xgifb_reg_get(XGIPART4, 0x23); -printk("XGIfb: XGI301B bridge detected\n"); +pr_debug("XGIfb: XGI301B bridge detected\n"); } */ else { hw_info->ujVBChipID =VB_CHIP_301 ;
drivers/staging/xgifb/vb_init.c +2 -45
177 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 7/8 Staging: xgifb: Fix sparse warnings.
In reply to Miguel GómezAdd include files with function definitions to avoid sparse warnings.
Signed-off-by Miguel Gómez <[email protected]>
--- drivers/staging/xgifb/vb_init.c | 1 + drivers/staging/xgifb/vb_setmode.c | 2 +- drivers/staging/xgifb/vb_util.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)
drivers/staging/xgifb/vb_init.c +1 -0
@@ -5,6 +5,7 @@#include "vb_def.h" #include "vb_util.h" #include "vb_setmode.h" +#include "vb_init.h" static const unsigned short XGINew_DDRDRAM_TYPE340[4 ][2 ] = { {16 ,0x45 }, {8 ,0x35 },
drivers/staging/xgifb/vb_setmode.c +1 -1
@@ -4,7 +4,7 @@#include "vb_def.h" #include "vb_util.h" #include "vb_table.h" - +#include "vb_setmode.h" #define IndexMask 0xff#define TVCLKBASE_315_25 (TVCLKBASE_315 + 25)
drivers/staging/xgifb/vb_util.c +1 -0
@@ -1,4 +1,5 @@#include "vgatypes.h" +#include "vb_util.h" void xgifb_reg_set (unsigned long port,u8 index,u8 data) {
Signature · 1 line
1.7.9.5
PATCH 8/8 Staging: xgifb: Replace pr_* with dev_* when possible.
In reply to Miguel GómezReplace pr_* calls with dev_* ones when the device structure is available.
Signed-off-by Miguel Gómez <[email protected]>
--- drivers/staging/xgifb/XGI_main_26.c | 72 +++++++++++++++++++++-------------- drivers/staging/xgifb/vb_init.c | 4 +- 2 files changed, 45 insertions(+), 31 deletions(-)
drivers/staging/xgifb/XGI_main_26.c +43 -29
@@ -1838,9 +1838,9 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, xgifb_info->mmio_base =pci_resource_start (pdev,1 ); xgifb_info->mmio_size =pci_resource_len (pdev,1 ); xgifb_info->vga_base =pci_resource_start (pdev,2 ) +0x30 ; -pr_info ("Relocate IO address: %Lx [%08lx]\n" , - (u64 )pci_resource_start (pdev,2 ), - xgifb_info->vga_base); +dev_info (&pdev->dev,"Relocate IO address: %Lx [%08lx]\n" , + (u64 )pci_resource_start (pdev,2 ), + xgifb_info->vga_base);if (pci_enable_device (pdev)) { ret = -EIO ;
@@ -1858,7 +1858,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, reg1 =xgifb_reg_get (XGISR ,IND_SIS_PASSWORD );if (reg1 !=0xa1 ) {/*I/O error */ -pr_err ("I/O error!!!" ); +dev_err (&pdev->dev,"I/O error!!!" ); ret = -EIO ; goto error_disable; }
@@ -1886,11 +1886,12 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, goto error_disable; } -pr_info ("chipid = %x\n" , xgifb_info->chip); +dev_info (&pdev->dev,"chipid = %x\n" , xgifb_info->chip); hw_info->jChipType = xgifb_info->chip;if (XGIfb_get_dram_size (xgifb_info)) { -pr_err ("Fatal error: Unable to determine RAM size.\n" ); +dev_err (&pdev->dev, +"Fatal error: Unable to determine RAM size.\n" ); ret = -ENODEV ; goto error_disable; }
@@ -1907,10 +1908,11 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,if (!request_mem_region (xgifb_info->video_base, xgifb_info->video_size,"XGIfb FB" )) { -pr_err ("unable request memory size %x\n" , +dev_err (&pdev->dev,"unable request memory size %x\n" , xgifb_info->video_size); -pr_err ("Fatal error: Unable to reserve frame buffer memory\n" ); -pr_err ("Is there another framebuffer driver active?\n" ); +dev_err (&pdev->dev, +"Fatal error: Unable to reserve frame buffer memory. " +"Is there another framebuffer driver active?\n" ); ret = -ENODEV ; goto error_disable; }
@@ -1918,7 +1920,8 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,if (!request_mem_region (xgifb_info->mmio_base, xgifb_info->mmio_size,"XGIfb MMIO" )) { -pr_err ("Fatal error: Unable to reserve MMIO region\n" ); +dev_err (&pdev->dev, +"Fatal error: Unable to reserve MMIO region\n" ); ret = -ENODEV ; goto error_0; }
@@ -1928,18 +1931,20 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, xgifb_info->mmio_vbase =ioremap (xgifb_info->mmio_base, xgifb_info->mmio_size); -pr_info ("Framebuffer at 0x%Lx, mapped to 0x%p, size %dk\n" , - (u64 ) xgifb_info->video_base, - xgifb_info->video_vbase, - xgifb_info->video_size /1024 ); +dev_info (&pdev->dev, +"Framebuffer at 0x%Lx, mapped to 0x%p, size %dk\n" , + (u64 ) xgifb_info->video_base, + xgifb_info->video_vbase, + xgifb_info->video_size /1024 ); -pr_info ("MMIO at 0x%Lx, mapped to 0x%p, size %ldk\n" , - (u64 ) xgifb_info->mmio_base, xgifb_info->mmio_vbase, - xgifb_info->mmio_size /1024 ); +dev_info (&pdev->dev, +"MMIO at 0x%Lx, mapped to 0x%p, size %ldk\n" , + (u64 ) xgifb_info->mmio_base, xgifb_info->mmio_vbase, + xgifb_info->mmio_size /1024 );pci_set_drvdata (pdev, xgifb_info);if (!XGIInitNew (pdev)) -pr_err ("XGIInitNew() failed!\n" ); +dev_err (&pdev->dev,"XGIInitNew() failed!\n" ); xgifb_info->mtrr = (unsigned int )0 ;
@@ -1968,10 +1973,14 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, reg =xgifb_reg_get (XGIPART4 ,0x01 );if (reg >=0xE0 ) { hw_info->ujVBChipID =VB_CHIP_302LV ; -pr_info ("XGI302LV bridge detected (revision 0x%02x)\n" , reg); +dev_info (&pdev->dev, +"XGI302LV bridge detected (revision 0x%02x)\n" , + reg); }else if (reg >=0xD0 ) { hw_info->ujVBChipID =VB_CHIP_301LV ; -pr_info ("XGI301LV bridge detected (revision 0x%02x)\n" , reg); +dev_info (&pdev->dev, +"XGI301LV bridge detected (revision 0x%02x)\n" , + reg); }/* else if (reg >= 0xB0) { hw_info->ujVBChipID = VB_CHIP_301B;
@@ -1980,17 +1989,21 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,} */ else { hw_info->ujVBChipID =VB_CHIP_301 ; -pr_info ("XGI301 bridge detected\n" ); +dev_info (&pdev->dev,"XGI301 bridge detected\n" ); }break ;case HASVB_302 : reg =xgifb_reg_get (XGIPART4 ,0x01 );if (reg >=0xE0 ) { hw_info->ujVBChipID =VB_CHIP_302LV ; -pr_info ("XGI302LV bridge detected (revision 0x%02x)\n" , reg); +dev_info (&pdev->dev, +"XGI302LV bridge detected (revision 0x%02x)\n" , + reg); }else if (reg >=0xD0 ) { hw_info->ujVBChipID =VB_CHIP_301LV ; -pr_info ("XGI302LV bridge detected (revision 0x%02x)\n" , reg); +dev_info (&pdev->dev, +"XGI302LV bridge detected (revision 0x%02x)\n" , + reg); }else if (reg >=0xB0 ) { reg1 =xgifb_reg_get (XGIPART4 ,0x23 );
@@ -1998,27 +2011,28 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, }else { hw_info->ujVBChipID =VB_CHIP_302 ; -pr_info ("XGI302 bridge detected\n" ); +dev_info (&pdev->dev,"XGI302 bridge detected\n" ); }break ;case HASVB_LVDS : hw_info->ulExternalChip =0x1 ; -pr_info ("LVDS transmitter detected\n" ); +dev_info (&pdev->dev,"LVDS transmitter detected\n" );break ;case HASVB_TRUMPION : hw_info->ulExternalChip =0x2 ; -pr_info ("Trumpion Zurac LVDS scaler detected\n" ); +dev_info (&pdev->dev,"Trumpion Zurac LVDS scaler detected\n" );break ;case HASVB_CHRONTEL : hw_info->ulExternalChip =0x4 ; -pr_info ("Chrontel TV encoder detected\n" ); +dev_info (&pdev->dev,"Chrontel TV encoder detected\n" );break ;case HASVB_LVDS_CHRONTEL : hw_info->ulExternalChip =0x5 ; -pr_info ("LVDS transmitter and Chrontel TV encoder detected\n" ); +dev_info (&pdev->dev, +"LVDS transmitter and Chrontel TV encoder detected\n" );break ;default : -pr_info ("No or unknown bridge type detected\n" ); +dev_info (&pdev->dev,"No or unknown bridge type detected\n" );break ; }
drivers/staging/xgifb/vb_init.c +2 -2
@@ -1319,11 +1319,11 @@ unsigned char XGIInitNew(struct pci_dev *pdev)/* Newdebugcode(0x99); */ if (pVBInfo->FBAddr ==NULL ) { -pr_debug ("pVBInfo->FBAddr == 0\n" ); +dev_dbg (&pdev->dev,"pVBInfo->FBAddr == 0\n" );return 0 ; }if (pVBInfo->BaseAddr ==0 ) { -pr_debug ("pVBInfo->BaseAddr == 0\n" ); +dev_dbg (&pdev->dev,"pVBInfo->BaseAddr == 0\n" );return 0 ; }
Signature · 1 line
1.7.9.5