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

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>

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 632ebfa7c408f5c88fee61a6824baaf36b184504..dc3c202612a9ac094452219aa583ff4cb9fed38d 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -1274,77 +1274,55 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo,
                                VCLKIndex = LCDXlat2VCLK[CRT2Index];
                        else
                                VCLKIndex = LCDXlat1VCLK[CRT2Index];
-               } else { /* for TV */
-                       if (pVBInfo->VBInfo & SetCRT2ToTV) {
-                               if (pVBInfo->VBInfo & SetCRT2ToHiVisionTV) {
-                                       if (pVBInfo->SetFlag & RPLLDIV2XO) {
-                                               VCLKIndex = HiTVVCLKDIV2;
-                                               VCLKIndex += 25;
-                                       } else {
-                                               VCLKIndex = HiTVVCLK;
-                                               VCLKIndex += 25;
-                                       }
-
-                                       if (pVBInfo->SetFlag & TVSimuMode) {
-                                               if (modeflag & Charx8Dot) {
-                                                       VCLKIndex =
-                                                               HiTVSimuVCLK;
-                                                       VCLKIndex += 25;
-                                               } else {
-                                                       VCLKIndex =
-                                                               HiTVTextVCLK;
-                                                       VCLKIndex += 25;
-                                               }
-                                       }
+               } else if (pVBInfo->VBInfo & SetCRT2ToHiVisionTV) {
+                       if (pVBInfo->SetFlag & RPLLDIV2XO) {
+                               VCLKIndex = HiTVVCLKDIV2;
+                               VCLKIndex += 25;
+                       } else {
+                               VCLKIndex = HiTVVCLK;
+                               VCLKIndex += 25;
+                       }
 
-                                       /* 301lv */
-                                       if (pVBInfo->VBType & VB_XGI301LV) {
-                                               if (!(pVBInfo->VBExtInfo ==
-                                                    VB_YPbPr1080i)) {
-                                                       VCLKIndex =
-                                                               YPbPr750pVCLK;
-                                                       if (!(pVBInfo->VBExtInfo
-                                                                       ==
-                                                            VB_YPbPr750p)) {
-                                                               VCLKIndex =
-                                                                 YPbPr525pVCLK;
-                                                               if (!(pVBInfo->VBExtInfo
-                                                                               == VB_YPbPr525p)) {
-                                                                       VCLKIndex
-                                                                                       = YPbPr525iVCLK_2;
-                                                                       if (!(pVBInfo->SetFlag
-                                                                                       & RPLLDIV2XO))
-                                                                               VCLKIndex
-                                                                                               = YPbPr525iVCLK;
-                                                               }
-                                                       }
-                                               }
-                                       }
+                       if (pVBInfo->SetFlag & TVSimuMode) {
+                               if (modeflag & Charx8Dot) {
+                                       VCLKIndex = HiTVSimuVCLK;
+                                       VCLKIndex += 25;
                                } else {
-                                       if (pVBInfo->VBInfo & SetCRT2ToTV) {
-                                               if (pVBInfo->SetFlag &
-                                                   RPLLDIV2XO) {
-                                                       VCLKIndex = TVVCLKDIV2;
-                                                       VCLKIndex += 25;
-                                               } else {
-                                                       VCLKIndex = TVVCLK;
-                                                       VCLKIndex += 25;
-                                               }
-                                       }
+                                       VCLKIndex = HiTVTextVCLK;
+                                       VCLKIndex += 25;
                                }
-                       } else { /* for CRT2 */
-                               /* Port 3cch */
-                               VCLKIndex = (unsigned char) inb(
-                                               (pVBInfo->P3ca + 0x02));
-                               VCLKIndex = ((VCLKIndex >> 2) & 0x03);
-                               if (ModeNo > 0x13) {
-                                       /* di+Ext_CRTVCLK */
-                                       VCLKIndex =
-                                               pVBInfo->RefIndex[
+                       }
+
+                       /* 301lv */
+                       if ((pVBInfo->VBType & VB_XGI301LV) &&
+                           !(pVBInfo->VBExtInfo == VB_YPbPr1080i)) {
+                               if (pVBInfo->VBExtInfo == VB_YPbPr750p)
+                                       VCLKIndex = YPbPr750pVCLK;
+                               else if (pVBInfo->VBExtInfo == VB_YPbPr525p)
+                                       VCLKIndex = YPbPr525pVCLK;
+                               else if (pVBInfo->SetFlag & RPLLDIV2XO)
+                                       VCLKIndex = YPbPr525iVCLK_2;
+                               else
+                                       VCLKIndex = YPbPr525iVCLK;
+                       }
+               } else if (pVBInfo->VBInfo & SetCRT2ToTV) {
+                       if (pVBInfo->SetFlag & RPLLDIV2XO) {
+                               VCLKIndex = TVVCLKDIV2;
+                               VCLKIndex += 25;
+                       } else {
+                               VCLKIndex = TVVCLK;
+                               VCLKIndex += 25;
+                       }
+               } else { /* for CRT2 */
+                       /* Port 3cch */
+                       VCLKIndex = (unsigned char) inb((pVBInfo->P3ca + 0x02));
+                       VCLKIndex = ((VCLKIndex >> 2) & 0x03);
+                       if (ModeNo > 0x13) {
+                               /* di+Ext_CRTVCLK */
+                               VCLKIndex = pVBInfo->RefIndex[
                                                        RefreshRateTableIndex].
                                                                Ext_CRTVCLK;
-                                       VCLKIndex &= IndexMask;
-                               }
+                               VCLKIndex &= IndexMask;
                        }
                }
        } else { /* LVDS */