hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging/xgifb: Consolidate if/else for 'identical' branches 

Since XGI_LCDDesStruct is fully contained in XGI330_LCDDataDesStruct2
and the offsets for the first members is identical we can consolidate
the if/else branches here and use XGI330_LCDDataDesStruct2 for
everything.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Huewe 2013-02-05 00:29:46 +01:00 committed by Greg Kroah-Hartman
parent 1504ecbeec
commit 826215d98f
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/xgifb/vb_setmode.c
View File

@ -1470,18 +1470,11 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
{ {
unsigned short tempbx, tempax, tempcx, tempdx, push1, push2, modeflag; unsigned short tempbx, tempax, tempcx, tempdx, push1, push2, modeflag;
unsigned long temp, temp1, temp2, temp3, push3; unsigned long temp, temp1, temp2, temp3, push3;
struct XGI_LCDDesStruct const *LCDPtr = NULL;
struct XGI330_LCDDataDesStruct2 const *LCDPtr1 = NULL; struct XGI330_LCDDataDesStruct2 const *LCDPtr1 = NULL;
modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag; modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
if (pVBInfo->LCDInfo & EnableScalingLCD) LCDPtr1 = XGI_GetLcdPtr(XGI_EPLLCDDesDataPtr, ModeNo, ModeIdIndex,
LCDPtr1 = XGI_GetLcdPtr(XGI_EPLLCDDesDataPtr, ModeNo, RefreshRateTableIndex, pVBInfo);
ModeIdIndex, RefreshRateTableIndex,
pVBInfo);
else
LCDPtr = XGI_GetLcdPtr(XGI_EPLLCDDesDataPtr, ModeNo,
ModeIdIndex, RefreshRateTableIndex,
pVBInfo);
XGI_GetLCDSync(&tempax, &tempbx, pVBInfo); XGI_GetLCDSync(&tempax, &tempbx, pVBInfo);
push1 = tempbx; push1 = tempbx;
@ -1513,10 +1506,7 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
tempax = pVBInfo->HT; tempax = pVBInfo->HT;
if (pVBInfo->LCDInfo & EnableScalingLCD) tempbx = LCDPtr1->LCDHDES;
tempbx = LCDPtr1->LCDHDES;
else
tempbx = LCDPtr->LCDHDES;
tempcx = pVBInfo->HDE; tempcx = pVBInfo->HDE;
tempbx = tempbx & 0x0fff; tempbx = tempbx & 0x0fff;
@ -1537,10 +1527,7 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
tempax = pVBInfo->HT; tempax = pVBInfo->HT;
if (pVBInfo->LCDInfo & EnableScalingLCD) tempbx = LCDPtr1->LCDHRS;
tempbx = LCDPtr1->LCDHRS;
else
tempbx = LCDPtr->LCDHRS;
tempcx = push2; tempcx = push2;
@ -1565,10 +1552,7 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
(unsigned short) (tempbx & 0xff)); (unsigned short) (tempbx & 0xff));
tempax = pVBInfo->VT; tempax = pVBInfo->VT;
if (pVBInfo->LCDInfo & EnableScalingLCD) tempbx = LCDPtr1->LCDVDES;
tempbx = LCDPtr1->LCDVDES;
else
tempbx = LCDPtr->LCDVDES;
tempcx = pVBInfo->VDE; tempcx = pVBInfo->VDE;
tempbx = tempbx & 0x0fff; tempbx = tempbx & 0x0fff;
@ -1589,10 +1573,7 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
| tempbx)); | tempbx));
tempax = pVBInfo->VT; tempax = pVBInfo->VT;
if (pVBInfo->LCDInfo & EnableScalingLCD) tempbx = LCDPtr1->LCDVRS;
tempbx = LCDPtr1->LCDVRS;
else
tempbx = LCDPtr->LCDVRS;
tempcx = push1; tempcx = push1;