[PATCH] staging: xgifb: correct the multiple line dereference to fix coding stye errors

From: Arushi Singhal
Date: Tue Feb 21 2017 - 12:19:34 EST


Error was reported by checkpatch.pl as
WARNING: Avoid multiple line dereference...
if there is boolean operator then it is fixed by Splitting line at
boolean operator.

Signed-off-by: Arushi Singhal <arushisinghal19971997@xxxxxxxxx>
---
drivers/staging/xgifb/XGI_main_26.c | 15 +++++----------
drivers/staging/xgifb/vb_setmode.c | 19 +++++++------------
2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 6930f7eb741b..4fd9bfafccc5 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -880,28 +880,23 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
if ((filter >= 0) && (filter <= 7)) {
pr_debug("FilterTable[%d]-%d: %*ph\n",
filter_tb, filter,
- 4, XGI_TV_filter[filter_tb].
- filter[filter]);
+ 4, XGI_TV_filter[filter_tb].filter[filter]);
xgifb_reg_set(
XGIPART2,
0x35,
- (XGI_TV_filter[filter_tb].
- filter[filter][0]));
+ (XGI_TV_filter[filter_tb].filter[filter][0]));
xgifb_reg_set(
XGIPART2,
0x36,
- (XGI_TV_filter[filter_tb].
- filter[filter][1]));
+ (XGI_TV_filter[filter_tb].filter[filter][1]));
xgifb_reg_set(
XGIPART2,
0x37,
- (XGI_TV_filter[filter_tb].
- filter[filter][2]));
+ (XGI_TV_filter[filter_tb].filter[filter][2]));
xgifb_reg_set(
XGIPART2,
0x38,
- (XGI_TV_filter[filter_tb].
- filter[filter][3]));
+ (XGI_TV_filter[filter_tb].filter[filter][3]));
}
}
}
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 7c7c8c8f1df3..00f1ae3adcda 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -221,8 +221,7 @@ 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 +230,7 @@ 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;
@@ -654,8 +652,8 @@ static void XGI_UpdateXG21CRTC(unsigned short ModeNo,
(XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC ==
RES640x480x60))
index = 12;
- else if (ModeNo == 0x2E && (XGI330_RefIndex[RefreshRateTableIndex].
- Ext_CRT1CRTC == RES640x480x72))
+ else if (ModeNo == 0x2E && (XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC ==
+ RES640x480x72))
index = 13;
else if (ModeNo == 0x2F)
index = 14;
@@ -5092,8 +5090,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;
@@ -5105,8 +5102,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 = XGI330_RefIndex[RefreshRateTableIndex + i - 1].Ext_InfoFlag;
if (temp & InterlaceMode)
i++;
}
@@ -5483,8 +5479,7 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
ModeIdIndex))
return 0;

- pVBInfo->ModeType = XGI330_EModeIDTable[ModeIdIndex].
- Ext_ModeFlag & ModeTypeMask;
+ pVBInfo->ModeType = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag & ModeTypeMask;

pVBInfo->SetFlag = 0;
pVBInfo->VBInfo = DisableCRT2Display;
--
2.11.0