staging: xgifb: vb_setmode: reduce if nesting in XGI_SetLockRegs()
Eliminate unnecessary nesting levels by rearranging code and conditions. The resulting code should be still identical. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
ebe3302410
commit
6596fc06e4
|
@ -4547,36 +4547,23 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
|
||||||
temp -= 6;
|
temp -= 6;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else if (!(modeflag & HalfDCLK)) {
|
||||||
if (!(modeflag & HalfDCLK)) {
|
temp -= 4;
|
||||||
temp -= 4;
|
if (pVBInfo->LCDResInfo != Panel1280x960 &&
|
||||||
if (pVBInfo->LCDResInfo != Panel1280x960) {
|
pVBInfo->VGAHDE >= 800) {
|
||||||
if (pVBInfo->VGAHDE >= 800) {
|
temp -= 7;
|
||||||
temp -= 7;
|
if (pVBInfo->ModeType == ModeEGA &&
|
||||||
if (pVBInfo->ModeType ==
|
pVBInfo->VGAVDE == 1024) {
|
||||||
ModeEGA) {
|
temp += 15;
|
||||||
if (pVBInfo->VGAVDE ==
|
if (pVBInfo->LCDResInfo !=
|
||||||
1024) {
|
Panel1280x1024)
|
||||||
temp += 15;
|
temp += 7;
|
||||||
if (pVBInfo->LCDResInfo != Panel1280x1024) {
|
|
||||||
temp +=
|
|
||||||
7;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pVBInfo->VGAHDE >= 1280) {
|
|
||||||
if (pVBInfo->LCDResInfo
|
|
||||||
!= Panel1280x960) {
|
|
||||||
if (pVBInfo->LCDInfo
|
|
||||||
& LCDNonExpanding) {
|
|
||||||
temp
|
|
||||||
+= 28;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (pVBInfo->VGAHDE >= 1280 &&
|
||||||
|
pVBInfo->LCDResInfo != Panel1280x960 &&
|
||||||
|
(pVBInfo->LCDInfo & LCDNonExpanding))
|
||||||
|
temp += 28;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue