staging: xgifb: correct the multiple line dereference
PATCH v5 1/1 staging: xgifb: correct the multiple line dereference
Error reported by checkpatch.pl as "avoid multiple line dereference". Addition of new variables to make the code more readable and also to correct about mentioned error as by itroducing new variables line is not exceeding 80 characters.
---
changes in v5
- changes done such that no other errors can generate.
- Improve the coding style.
- Introduced new variables.
drivers/staging/xgifb/XGI_main_26.c | 29 ++++++----------------------- drivers/staging/xgifb/vb_setmode.c | 17 +++++++++++------ 2 files changed, 17 insertions(+), 29 deletions(-)
drivers/staging/xgifb/XGI_main_26.c +6 -23
@@ -878,30 +878,13 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info) }if ((filter >=0 ) && (filter <=7 )) { +const u8 *f = XGI_TV_filter[filter_tb].filter[filter];pr_debug ("FilterTable[%d]-%d: %*ph\n" , - filter_tb, filter, -4 , XGI_TV_filter[filter_tb]. - filter[filter]); -xgifb_reg_set ( -XGIPART2 , -0x35 , - (XGI_TV_filter[filter_tb]. - filter[filter][0 ])); -xgifb_reg_set ( -XGIPART2 , -0x36 , - (XGI_TV_filter[filter_tb]. - filter[filter][1 ])); -xgifb_reg_set ( -XGIPART2 , -0x37 , - (XGI_TV_filter[filter_tb]. - filter[filter][2 ])); -xgifb_reg_set ( -XGIPART2 , -0x38 , - (XGI_TV_filter[filter_tb]. - filter[filter][3 ])); + filter_tb, filter,4 , f); +xgifb_reg_set (XGIPART2 ,0x35 , f[0 ]); +xgifb_reg_set (XGIPART2 ,0x36 , f[1 ]); +xgifb_reg_set (XGIPART2 ,0x37 , f[2 ]); +xgifb_reg_set (XGIPART2 ,0x38 , f[3 ]); } } }
drivers/staging/xgifb/vb_setmode.c +11 -6
@@ -221,8 +221,11 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,for (; XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID == tempbx; (*i)--) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; +int j; + + j = XGI330_RefIndex[RefreshRateTableIndex + (*i)].Ext_InfoFlag; + infoflag = j; +if (infoflag & tempax)return 1 ;
@@ -231,8 +234,11 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, }for ((*i) =0 ;; (*i)++) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; +int m; + + m = XGI330_RefIndex[RefreshRateTableIndex + (*i)].Ext_InfoFlag; + infoflag = m; +if (XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID != tempbx) {return 0 ;
@@ -5092,8 +5098,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, i =0 ; do { - if (XGI330_RefIndex[RefreshRateTableIndex + i]. - ModeID != ModeNo) + if (XGI330_RefIndex[RefreshRateTableIndex + i].ModeID != ModeNo) break; temp = XGI330_RefIndex[RefreshRateTableIndex + i].Ext_InfoFlag; temp &= ModeTypeMask;
Signature · 1 line
2.11.0
Quoted 4 lines · Arushi Singhal
Error reported by checkpatch.pl as "avoid multiple line dereference". Addition of new variables to make the code more readable and also to correct about mentioned error as by itroducing new variables line is not exceeding 80 characters.
[]
drivers/staging/xgifb/vb_setmode.c
Quoted 1 line
drivers/staging/xgifb/vb_setmode.c +0
-0
[]
drivers/staging/xgifb/vb_setmode.c static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, · line 227
Quoted 10 lines
drivers/staging/xgifb/vb_setmode.c +4
-2@@ -221,8 +221,11 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,for (; XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID == tempbx; (*i)--) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; +int j; + + j = XGI330_RefIndex[RefreshRateTableIndex + (*i)].Ext_InfoFlag; + infoflag = j;
Better would be to introduce a temporary like:
const struct XGI_Ext2Struct *ext2;
[code...]
ext2 = &XGI330_RefIndex[RefreshRateTableIndex];
and then index that like
for (; ext2[*i].ModeID == tempbx; (*i)--) {
infoflag = ext2[*i].Ext_InfoFlag;drivers/staging/xgifb/vb_setmode.c static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, · line 235
Quoted 10 lines
drivers/staging/xgifb/vb_setmode.c +1
-2+if (infoflag & tempax)return 1 ;@@ -231,8 +234,11 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, }for ((*i) =0 ;; (*i)++) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag;
etc...