Commit 470c5338 authored by Miguel Gómez's avatar Miguel Gómez Committed by Greg Kroah-Hartman

Staging: xgifb: Rework conditions in XGI_SetLockRegs().

Rework some conditions to reduce indentation and fix style warnings.
Signed-off-by: default avatarMiguel Gómez <magomez@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3339db8a
...@@ -4039,24 +4039,16 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -4039,24 +4039,16 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
} }
if (pVBInfo->VBInfo & SetCRT2ToHiVision) { if (pVBInfo->VBInfo & SetCRT2ToHiVision) {
if (pVBInfo->VBType & VB_SIS301LV) { if ((pVBInfo->VBType & VB_SIS301LV) &&
if (pVBInfo->TVInfo & TVSetHiVision) { !(pVBInfo->TVInfo & TVSetHiVision)) {
tempbx -= 10; if ((pVBInfo->TVInfo & TVSimuMode) &&
} else { (pVBInfo->TVInfo & TVSetPAL)) {
if (pVBInfo->TVInfo & TVSimuMode) { if (!(pVBInfo->VBType & VB_SIS301LV) ||
if (pVBInfo->TVInfo & TVSetPAL) { !(pVBInfo->TVInfo &
if (pVBInfo->VBType &
VB_SIS301LV) {
if (!(pVBInfo->TVInfo &
(TVSetYPbPr525p | (TVSetYPbPr525p |
TVSetYPbPr750p | TVSetYPbPr750p |
TVSetHiVision))) TVSetHiVision)))
tempbx += 40; tempbx += 40;
} else {
tempbx += 40;
}
}
}
} }
} else { } else {
tempbx -= 10; tempbx -= 10;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment