Staging: xgifb: Rework conditions in XGI_SetLockRegs().

Rework some conditions to reduce indentation and fix style warnings.

Signed-off-by: Miguel Gómez <magomez@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Miguel Gómez 2012-07-06 12:40:50 +02:00 committed by Greg Kroah-Hartman
parent 3339db8a0c
commit 470c533896

View File

@ -4039,24 +4039,16 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
}
if (pVBInfo->VBInfo & SetCRT2ToHiVision) {
if (pVBInfo->VBType & VB_SIS301LV) {
if (pVBInfo->TVInfo & TVSetHiVision) {
tempbx -= 10;
} else {
if (pVBInfo->TVInfo & TVSimuMode) {
if (pVBInfo->TVInfo & TVSetPAL) {
if (pVBInfo->VBType &
VB_SIS301LV) {
if (!(pVBInfo->TVInfo &
(TVSetYPbPr525p |
TVSetYPbPr750p |
TVSetHiVision)))
tempbx += 40;
} else {
tempbx += 40;
}
}
}
if ((pVBInfo->VBType & VB_SIS301LV) &&
!(pVBInfo->TVInfo & TVSetHiVision)) {
if ((pVBInfo->TVInfo & TVSimuMode) &&
(pVBInfo->TVInfo & TVSetPAL)) {
if (!(pVBInfo->VBType & VB_SIS301LV) ||
!(pVBInfo->TVInfo &
(TVSetYPbPr525p |
TVSetYPbPr750p |
TVSetHiVision)))
tempbx += 40;
}
} else {
tempbx -= 10;