Staging: xgifb: Rework conditions in XGI_SetLockRegs().

Rework some conditions to reduce indentation and fix style warnings.

Signed-off-by: Miguel Gómez <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index a7ba99f42a682f87dbbc0f1ba6587752536f5a37..5b2c35af4aa3b83269b16a74236e569e6b712093 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -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;