Skip to content

Commit

Permalink
Staging: xgifb: Rework conditions in XGI_SetLockRegs().
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Miguel Gómez authored and Greg Kroah-Hartman committed Jul 11, 2012
1 parent 3339db8 commit 470c533
Showing 1 changed file with 10 additions and 18 deletions.
28 changes: 10 additions & 18 deletions drivers/staging/xgifb/vb_setmode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 470c533

Please sign in to comment.