Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 20:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: xgifb: vb_setmode: reduce if nesting in XGI_SetLockRegs()

Browse Source 
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:
Aaro Koskinen 2011-11-27 23:03:19 +02:00 committed by Greg Kroah-Hartman
parent ebe3302410
commit 6596fc06e4
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4547,36 +4547,23 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
temp -= 6;
}
}
} else {
if (!(modeflag & HalfDCLK)) {
temp -= 4;
if (pVBInfo->LCDResInfo != Panel1280x960) {
if (pVBInfo->VGAHDE >= 800) {
temp -= 7;
if (pVBInfo->ModeType ==
ModeEGA) {
if (pVBInfo->VGAVDE ==
1024) {
temp += 15;
if (pVBInfo->LCDResInfo != Panel1280x1024) {
temp +=
7;
}
}
}
if (pVBInfo->VGAHDE >= 1280) {
if (pVBInfo->LCDResInfo
!= Panel1280x960) {
if (pVBInfo->LCDInfo
& LCDNonExpanding) {
temp
+= 28;
}
}
}
}
} else if (!(modeflag & HalfDCLK)) {
temp -= 4;
if (pVBInfo->LCDResInfo != Panel1280x960 &&
pVBInfo->VGAHDE >= 800) {
temp -= 7;
if (pVBInfo->ModeType == ModeEGA &&
pVBInfo->VGAVDE == 1024) {
temp += 15;
if (pVBInfo->LCDResInfo !=
Panel1280x1024)
temp += 7;
}
if (pVBInfo->VGAHDE >= 1280 &&
pVBInfo->LCDResInfo != Panel1280x960 &&
(pVBInfo->LCDInfo & LCDNonExpanding))
temp += 28;
}
}
}