iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging/xgifb: Remove redundant if statement

Browse Source 
The code checks twice for if (pVBInfo->VBInfo & SetCRT2ToTV) without any
changes in between -> we can remove the second check.
And while at it we can also save the temp variable and use tempbx
directly.

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-03 04:08:45 +01:00 committed by Greg Kroah-Hartman
parent a9e29e6d41
commit 5fc699f608
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2197,31 +2197,25 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
struct vb_device_info *pVBInfo)
{
unsigned short temp, tempbx = 0, resinfo = 0, modeflag, index1;
tempbx = 0;
resinfo = 0;
unsigned short tempbx = 0, resinfo = 0, modeflag, index1;
if (pVBInfo->VBInfo & SetCRT2ToTV) {
modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
if (pVBInfo->VBInfo & SetCRT2ToTV) {
temp = xgifb_reg_get(pVBInfo->P3d4, 0x35);
tempbx = temp;
if (tempbx & TVSetPAL) {
tempbx &= (SetCHTVOverScan |
TVSetPALM |
TVSetPALN |
TVSetPAL);
if (tempbx & TVSetPALM)
/* set to NTSC if PAL-M */
tempbx &= ~TVSetPAL;
} else
tempbx &= (SetCHTVOverScan |
TVSetNTSCJ |
TVSetPAL);
}
tempbx = xgifb_reg_get(pVBInfo->P3d4, 0x35);
if (tempbx & TVSetPAL) {
tempbx &= (SetCHTVOverScan |
TVSetPALM |
TVSetPALN |
TVSetPAL);
if (tempbx & TVSetPALM)
/* set to NTSC if PAL-M */
tempbx &= ~TVSetPAL;
} else
tempbx &= (SetCHTVOverScan |
TVSetNTSCJ |
TVSetPAL);
if (pVBInfo->IF_DEF_LVDS == 0) {
if (pVBInfo->VBInfo & SetCRT2ToSCART)