staging: xgifb: correct the multiple line dereference
PATCH v7 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.
---
changes in v7
- Improve the coding style.
- Introduced new variables.
drivers/staging/xgifb/XGI_main_26.c | 29 ++++++----------------------- drivers/staging/xgifb/vb_setmode.c | 11 +++++------ 2 files changed, 11 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 +5 -6
@@ -221,8 +221,8 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,for (; XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID == tempbx; (*i)--) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; + infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].Ext_InfoFlag; +if (infoflag & tempax)return 1 ;
@@ -231,8 +231,8 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, }for ((*i) =0 ;; (*i)++) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; + infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].Ext_InfoFlag; +if (XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID != tempbx) {return 0 ;
@@ -5092,8 +5092,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 2 lines · Arushi Singhal
Error reported by checkpatch.pl as "avoid multiple line dereference". Addition of new variables to make the code more readable.
You should probably split this into 2 patches, one for each file.
What Julia said about finding a better/shorter identifier than RefreshRateTableIndex is true but I still suggest something like:
drivers/staging/xgifb/vb_setmode.c@@ -221,8 +221,8 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,
Quoted 8 lines
drivers/staging/xgifb/vb_setmode.c@@ -221,8 +221,8 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, renamed from drivers/staging/xgifb/vb_setmode.c +2
-2for (; XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID == tempbx; (*i)--) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; + infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].Ext_InfoFlag; +
I suggest something like:
--- drivers/staging/xgifb/vb_setmode.c | 41 ++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 22 deletions(-)
drivers/staging/xgifb/vb_setmode.c +19 -22
@@ -172,10 +172,12 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) {unsigned short tempax, tempbx, resinfo, modeflag, infoflag; +const struct XGI_Ext2Struct *ext2; modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag; resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO; - tempbx = XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID; + ext2 = &XGI330_RefIndex[RefreshRateTableIndex]; + tempbx = ext2[*i].ModeID; tempax =0 ;if (pVBInfo->VBInfo & SetCRT2ToRAMDAC) {
@@ -219,10 +221,8 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,return 0 ; } -for (; XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID == - tempbx; (*i)--) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; +for (; ext2[*i].ModeID == tempbx; (*i)--) { + infoflag = ext2[*i].Ext_InfoFlag;if (infoflag & tempax)return 1 ;
@@ -231,12 +231,9 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, }for ((*i) =0 ;; (*i)++) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; -if (XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID - != tempbx) { + infoflag = ext2[*i].Ext_InfoFlag; +if (ext2[*i].ModeID != tempbx)return 0 ; - }if (infoflag & tempax)return 1 ;
@@ -5050,6 +5047,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, {const u8 LCDARefreshIndex[] = {0x00 ,0x00 ,0x03 ,0x01 ,0x01 ,0x01 ,0x01 ,0x00 }; +const struct XGI_Ext2Struct *ext2;unsigned short RefreshRateTableIndex, i, index, temp;
@@ -5073,29 +5071,29 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, } RefreshRateTableIndex = XGI330_EModeIDTable[ModeIdIndex].REFindex; - ModeNo = XGI330_RefIndex[RefreshRateTableIndex].ModeID; + ext2 = &XGI330_RefIndex[RefreshRateTableIndex]; + ModeNo = ext2->ModeID;if (pXGIHWDE->jChipType >=XG20 ) {/* for XG20, XG21, XG27 */ -if ((XGI330_RefIndex[RefreshRateTableIndex].XRes ==800 ) && - (XGI330_RefIndex[RefreshRateTableIndex].YRes ==600 )) { +if ((ext2->XRes ==800 ) && + (ext2->YRes ==600 )) { index++; }/* do the similar adjustment like XGISearchCRT1Rate() */ -if ((XGI330_RefIndex[RefreshRateTableIndex].XRes ==1024 ) && - (XGI330_RefIndex[RefreshRateTableIndex].YRes ==768 )) { +if ((ext2->XRes ==1024 ) && + (ext2->YRes ==768 )) { index++; } -if ((XGI330_RefIndex[RefreshRateTableIndex].XRes ==1280 ) && - (XGI330_RefIndex[RefreshRateTableIndex].YRes ==1024 )) { +if ((ext2->XRes ==1280 ) && + (ext2->YRes ==1024 )) { index++; } } i =0 ; do { - if (XGI330_RefIndex[RefreshRateTableIndex + i]. - ModeID != ModeNo) + if (ext2[i].ModeID != ModeNo) break; - temp = XGI330_RefIndex[RefreshRateTableIndex + i].Ext_InfoFlag; + temp = ext2[i].Ext_InfoFlag; temp &= ModeTypeMask; if (temp < pVBInfo->ModeType) break;
@@ -5105,8 +5103,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, }while (index !=0xFFFF );if (!(pVBInfo->VBInfo & SetCRT2ToRAMDAC)) {if (pVBInfo->VBInfo & SetInSlaveMode) { - temp = XGI330_RefIndex[RefreshRateTableIndex + i -1 ]. - Ext_InfoFlag; + temp = ext2[i -1 ].Ext_InfoFlag;if (temp & InterlaceMode) i++; }
Quoted 58 lines · Joe Perches
Quoted 2 lines · Arushi Singhal
Error reported by checkpatch.pl as "avoid multiple line dereference". Addition of new variables to make the code more readable.
You should probably split this into 2 patches, one for each file.
What Julia said about finding a better/shorter identifier than RefreshRateTableIndex is true but I still suggest something like:
drivers/staging/xgifb/vb_setmode.c@@ -221,8 +221,8 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,
Quoted 8 lines
drivers/staging/xgifb/vb_setmode.c@@ -221,8 +221,8 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, renamed from drivers/staging/xgifb/vb_setmode.c +2
-2for (; XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID == tempbx; (*i)--) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; + infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].Ext_InfoFlag; +I suggest something like:
--- drivers/staging/xgifb/vb_setmode.c | 41 ++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 22 deletions(-)drivers/staging/xgifb/vb_setmode.c +5
-5@@ -172,10 +172,12 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) {unsigned short tempax, tempbx, resinfo, modeflag, infoflag; +const struct XGI_Ext2Struct *ext2; modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag; resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO; - tempbx = XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID; + ext2 = &XGI330_RefIndex[RefreshRateTableIndex]; + tempbx = ext2[*i].ModeID; tempax =0 ;if (pVBInfo->VBInfo & SetCRT2ToRAMDAC) {@@ -219,10 +221,8 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,return 0 ; } -for (; XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID == - tempbx; (*i)--) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; +for (; ext2[*i].ModeID == tempbx; (*i)--) { + infoflag = ext2[*i].Ext_InfoFlag;if (infoflag & tempax)return 1 ;@@ -231,12 +231,9 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, }
drivers/staging/xgifb/vb_setmode.c static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, · line 239
Quoted 10 lines
drivers/staging/xgifb/vb_setmode.c +2
-5for ((*i) =0 ;; (*i)++) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; -if (XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID - != tempbx) { + infoflag = ext2[*i].Ext_InfoFlag; +if (ext2[*i].ModeID != tempbx)return 0 ; - }
It's drifting a little bit from the original issue, but the whole *i thing is not very nice. The function is used in only one place, and the call looks like this:
temp = XGI_AjustCRT2Rate(ModeIdIndex, RefreshRateTableIndex,
&i, pVBInfo);
immediately followed by:
return RefreshRateTableIndex + i;
temp is never used. Could the function be made to return a negative error code on failure and the updated value of i on success? The (*i) could become just i, which would even be a little shorter.
julia
Quoted 69 lines
drivers/staging/xgifb/vb_setmode.c +12
-13if (infoflag & tempax)return 1 ;@@ -5050,6 +5047,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, {const u8 LCDARefreshIndex[] = {0x00 ,0x00 ,0x03 ,0x01 ,0x01 ,0x01 ,0x01 ,0x00 }; +const struct XGI_Ext2Struct *ext2;unsigned short RefreshRateTableIndex, i, index, temp;@@ -5073,29 +5071,29 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, } RefreshRateTableIndex = XGI330_EModeIDTable[ModeIdIndex].REFindex; - ModeNo = XGI330_RefIndex[RefreshRateTableIndex].ModeID; + ext2 = &XGI330_RefIndex[RefreshRateTableIndex]; + ModeNo = ext2->ModeID;if (pXGIHWDE->jChipType >=XG20 ) {/* for XG20, XG21, XG27 */ -if ((XGI330_RefIndex[RefreshRateTableIndex].XRes ==800 ) && - (XGI330_RefIndex[RefreshRateTableIndex].YRes ==600 )) { +if ((ext2->XRes ==800 ) && + (ext2->YRes ==600 )) { index++; }/* do the similar adjustment like XGISearchCRT1Rate() */ -if ((XGI330_RefIndex[RefreshRateTableIndex].XRes ==1024 ) && - (XGI330_RefIndex[RefreshRateTableIndex].YRes ==768 )) { +if ((ext2->XRes ==1024 ) && + (ext2->YRes ==768 )) { index++; } -if ((XGI330_RefIndex[RefreshRateTableIndex].XRes ==1280 ) && - (XGI330_RefIndex[RefreshRateTableIndex].YRes ==1024 )) { +if ((ext2->XRes ==1280 ) && + (ext2->YRes ==1024 )) { index++; } } i =0 ; do { - if (XGI330_RefIndex[RefreshRateTableIndex + i]. - ModeID != ModeNo) + if (ext2[i].ModeID != ModeNo) break; - temp = XGI330_RefIndex[RefreshRateTableIndex + i].Ext_InfoFlag; + temp = ext2[i].Ext_InfoFlag; temp &= ModeTypeMask; if (temp < pVBInfo->ModeType) break;@@ -5105,8 +5103,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, }while (index !=0xFFFF );if (!(pVBInfo->VBInfo & SetCRT2ToRAMDAC)) {if (pVBInfo->VBInfo & SetInSlaveMode) { - temp = XGI330_RefIndex[RefreshRateTableIndex + i -1 ]. - Ext_InfoFlag; + temp = ext2[i -1 ].Ext_InfoFlag;if (temp & InterlaceMode) i++; } --You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1488280264.25838.26.camel%40perches.com.
For more options, visit https://groups.google.com/d/optout.
Quoted 7 lines · Julia Lawall
It's drifting a little bit from the original issue, but the whole *i thing is not very nice. The function is used in only one place, and the call looks like this:
temp = XGI_AjustCRT2Rate(ModeIdIndex, RefreshRateTableIndex,
&i, pVBInfo);
Quoted 7 lines
immediately followed by:
return RefreshRateTableIndex + i;
temp is never used. Could the function be made to return a negative error code on failure and the updated value of i on success? The (*i) could become just i, which would even be a little shorter.
I don't see why not.
A message that is not in the archive (sent off-list or not yet received): CA+XqjF8J2o8gwhPs6_U2TLBviTyra1pAThdbBfp7duvEzbxQWA@mail.gmail.com
Quoted 6 lines · Arushi Singhal
Quoted 4 lines · Joe Perches
Quoted 2 lines · Arushi Singhal
Error reported by checkpatch.pl as "avoid multiple line dereference". Addition of new variables to make the code more readable.
Quoted 8 lines
Quoted 4 lines
You should probably split this into 2 patches, one for each file.
Hi Joe
But I thinkl the major issue is to correct the "avoid multiple line dereference".
Not really.
The issue here is making the code intelligible for a human and as error free as possible.
Using multiple line statements are generally hard for people to read.
Using repeated long identifiers with similar names can be error prone.
Using shorter temporary/automatic variables for repeated long dereferences can make code easier for humans to read while having the benefit of possibly reducing generated object code size.
I believe the first file modified by your patch has no issue and can be applied separately if it is not bound up with the changes to the second file.
best of luck.
Quoted 148 lines
Thanks
ArushiQuoted 145 lines
What Julia said about finding a better/shorter identifier than RefreshRateTableIndex is true but I still suggest something like:
Review
Quoted 1 line
(quoted diff) +0
-0b/drivers/staging/xgifb/vb_setmode.c@@ -221,8 +221,8 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,
drivers/staging/xgifb/vb_setmode.c static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,
Quoted 6 lines
for (; XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID == tempbx; (*i)--) {drivers/staging/xgifb/vb_setmode.c +1
-2- infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; + infoflag = XGI330_RefIndex[RefreshRateTableIndex +(*i)].Ext_InfoFlag;
Quoted 1 line
+
I suggest something like:
--- drivers/staging/xgifb/vb_setmode.c | 41 ++++++++++++++++++------------ -------- 1 file changed, 19 insertions(+), 22 deletions(-)drivers/staging/xgifb/vb_setmode.c +3
-1@@ -172,10 +172,12 @@ static unsigned char XGI_AjustCRT2Rate(unsignedshort ModeIdIndex, struct vb_device_info *pVBInfo) { unsigned short tempax, tempbx, resinfo, modeflag, infoflag; +const struct XGI_Ext2Struct *ext2; modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag; resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO; - tempbx = XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID; + ext2 = &XGI330_RefIndex[RefreshRateTableIndex]; + tempbx = ext2[*i].ModeID; tempax =0 ;if (pVBInfo->VBInfo & SetCRT2ToRAMDAC) {drivers/staging/xgifb/vb_setmode.c +4
-9@@ -219,10 +221,8 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, return 0; } -for (; XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID == - tempbx; (*i)--) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; +for (; ext2[*i].ModeID == tempbx; (*i)--) { + infoflag = ext2[*i].Ext_InfoFlag;if (infoflag & tempax)return 1 ;@@ -231,12 +231,9 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, }for ((*i) =0 ;; (*i)++) { - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)]. - Ext_InfoFlag; -if (XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID - != tempbx) { + infoflag = ext2[*i].Ext_InfoFlag; +if (ext2[*i].ModeID != tempbx)return 0 ; - }if (infoflag & tempax)return 1;drivers/staging/xgifb/vb_setmode.c +3
-2@@ -5050,6 +5047,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, {const u8 LCDARefreshIndex[] = {0x00 ,0x00 ,0x03 ,0x01 ,0x01 ,0x01 ,0x01 ,0x00 }; +const struct XGI_Ext2Struct *ext2;unsigned short RefreshRateTableIndex, i, index, temp;@@ -5073,29 +5071,29 @@ unsigned short XGI_GetRatePtrCRT2(structxgi_hw_device_info *pXGIHWDE, } RefreshRateTableIndex = XGI330_EModeIDTable[ModeIdIndex].REFindex; - ModeNo = XGI330_RefIndex[RefreshRateTableIndex].ModeID; + ext2 = &XGI330_RefIndex[RefreshRateTableIndex]; + ModeNo = ext2->ModeID;if (pXGIHWDE->jChipType >=XG20 ) {/* for XG20, XG21, XG27 */ - if ((XGI330_RefIndex[RefreshRateTableIndex].XRes == 800)&&
- (XGI330_RefIndex[RefreshRateTableIndex].YRes == 600))
{drivers/staging/xgifb/vb_setmode.c +2
-1+if ((ext2->XRes ==800 ) && + (ext2->YRes ==600 )) { index++; }/* do the similar adjustment like XGISearchCRT1Rate() */ - if ((XGI330_RefIndex[RefreshRateTableIndex].XRes == 1024)&&
- (XGI330_RefIndex[RefreshRateTableIndex].YRes == 768))
{drivers/staging/xgifb/vb_setmode.c +2
-1+if ((ext2->XRes ==1024 ) && + (ext2->YRes ==768 )) { index++; } - if ((XGI330_RefIndex[RefreshRateTableIndex].XRes == 1280)&&
- (XGI330_RefIndex[RefreshRateTableIndex].YRes ==
1024)) {drivers/staging/xgifb/vb_setmode.c +3
-3+if ((ext2->XRes ==1280 ) && + (ext2->YRes ==1024 )) { index++; } } i =0 ; do { - if (XGI330_RefIndex[RefreshRateTableIndex + i]. - ModeID != ModeNo) + if (ext2[i].ModeID != ModeNo) break; - temp = XGI330_RefIndex[RefreshRateTableIndex +i].Ext_InfoFlag;
drivers/staging/xgifb/vb_setmode.c +2
-3+ temp = ext2[i].Ext_InfoFlag; temp &= ModeTypeMask;if (temp < pVBInfo->ModeType)break ;@@ -5105,8 +5103,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, }while (index !=0xFFFF );if (!(pVBInfo->VBInfo & SetCRT2ToRAMDAC)) {if (pVBInfo->VBInfo & SetInSlaveMode) { - temp = XGI330_RefIndex[RefreshRateTableIndex + i - 1]. - Ext_InfoFlag; + temp = ext2[i -1 ].Ext_InfoFlag;if (temp & InterlaceMode) i++; }