staging: xgifb: ReadVBIOSTablData(): rearrange code to avoid nesting

Rearrange code to avoid deep nesting. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

staging: xgifb: ReadVBIOSTablData(): rearrange code to avoid nesting
Rearrange code to avoid deep nesting. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
bd761274 · Aaro Koskinen · Greg Kroah-Hartman · b8e71975 · bd761274
Commit bd761274 authored Dec 06, 2011 by Aaro Koskinen Committed by Greg Kroah-Hartman Dec 08, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 51 additions and 60 deletions

drivers/staging/xgifb/vb_init.c drivers/staging/xgifb/vb_init.c +51 -60

No files found.
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -1100,66 +1100,57 @@ static void ReadVBIOSTablData(unsigned char ChipType,
 	unsigned char j, k;
 	/* Volari customize data area end */
-	if (ChipType == XG21) {
+	if (ChipType != XG21)
-		pVBInfo->IF_DEF_LVDS = 0;
+		return;
-		if (pVideoMemory[0x65] & 0x1) {
+	pVBInfo->IF_DEF_LVDS = 0;
-			pVBInfo->IF_DEF_LVDS = 1;
+	if (!(pVideoMemory[0x65] & 0x1))
-			i = pVideoMemory[0x316] | (pVideoMemory[0x317] << 8);
+		return;
-			j = pVideoMemory[i - 1];
+	pVBInfo->IF_DEF_LVDS = 1;
-			if (j == 0xff)
+	i = pVideoMemory[0x316] | (pVideoMemory[0x317] << 8);
-				j = 1;
+	j = pVideoMemory[i - 1];
-			k = 0;
+	if (j == 0xff)
-			do {
+		j = 1;
-				pVBInfo->XG21_LVDSCapList[k].LVDS_Capability
+	k = 0;
-						= pVideoMemory[i] |
+	do {
-						  (pVideoMemory[i + 1] << 8);
+		pVBInfo->XG21_LVDSCapList[k].LVDS_Capability
-				pVBInfo->XG21_LVDSCapList[k].LVDSHT
+				= pVideoMemory[i] | (pVideoMemory[i + 1] << 8);
-						= pVideoMemory[i + 2] |
+		pVBInfo->XG21_LVDSCapList[k].LVDSHT
-						  (pVideoMemory[i + 3] << 8);
+				= pVideoMemory[i + 2] |
-				pVBInfo->XG21_LVDSCapList[k].LVDSVT
+				  (pVideoMemory[i + 3] << 8);
-						= pVideoMemory[i + 4] |
+		pVBInfo->XG21_LVDSCapList[k].LVDSVT
-						  (pVideoMemory[i + 5] << 8);
+				= pVideoMemory[i + 4] |
-				pVBInfo->XG21_LVDSCapList[k].LVDSHDE
+				  (pVideoMemory[i + 5] << 8);
-						= pVideoMemory[i + 6] |
+		pVBInfo->XG21_LVDSCapList[k].LVDSHDE
-						  (pVideoMemory[i + 7] << 8);
+				= pVideoMemory[i + 6] |
-				pVBInfo->XG21_LVDSCapList[k].LVDSVDE
+				  (pVideoMemory[i + 7] << 8);
-						= pVideoMemory[i + 8] |
+		pVBInfo->XG21_LVDSCapList[k].LVDSVDE
-						  (pVideoMemory[i + 9] << 8);
+				= pVideoMemory[i + 8] |
-				pVBInfo->XG21_LVDSCapList[k].LVDSHFP
+				  (pVideoMemory[i + 9] << 8);
-						= pVideoMemory[i + 10] |
+		pVBInfo->XG21_LVDSCapList[k].LVDSHFP
-						  (pVideoMemory[i + 11] << 8);
+				= pVideoMemory[i + 10] |
-				pVBInfo->XG21_LVDSCapList[k].LVDSVFP
+				  (pVideoMemory[i + 11] << 8);
-						= pVideoMemory[i + 12] |
+		pVBInfo->XG21_LVDSCapList[k].LVDSVFP
-						  (pVideoMemory[i + 13] << 8);
+				= pVideoMemory[i + 12] |
-				pVBInfo->XG21_LVDSCapList[k].LVDSHSYNC
+				  (pVideoMemory[i + 13] << 8);
-						= pVideoMemory[i + 14] |
+		pVBInfo->XG21_LVDSCapList[k].LVDSHSYNC
-						  (pVideoMemory[i + 15] << 8);
+				= pVideoMemory[i + 14] |
-				pVBInfo->XG21_LVDSCapList[k].LVDSVSYNC
+				  (pVideoMemory[i + 15] << 8);
-						= pVideoMemory[i + 16] |
+		pVBInfo->XG21_LVDSCapList[k].LVDSVSYNC
-						  (pVideoMemory[i + 17] << 8);
+				= pVideoMemory[i + 16] |
-				pVBInfo->XG21_LVDSCapList[k].VCLKData1
+				  (pVideoMemory[i + 17] << 8);
-						= pVideoMemory[i + 18];
+		pVBInfo->XG21_LVDSCapList[k].VCLKData1 = pVideoMemory[i + 18];
-				pVBInfo->XG21_LVDSCapList[k].VCLKData2
+		pVBInfo->XG21_LVDSCapList[k].VCLKData2 = pVideoMemory[i + 19];
-						= pVideoMemory[i + 19];
+		pVBInfo->XG21_LVDSCapList[k].PSC_S1 = pVideoMemory[i + 20];
-				pVBInfo->XG21_LVDSCapList[k].PSC_S1
+		pVBInfo->XG21_LVDSCapList[k].PSC_S2 = pVideoMemory[i + 21];
-						= pVideoMemory[i + 20];
+		pVBInfo->XG21_LVDSCapList[k].PSC_S3 = pVideoMemory[i + 22];
-				pVBInfo->XG21_LVDSCapList[k].PSC_S2
+		pVBInfo->XG21_LVDSCapList[k].PSC_S4 = pVideoMemory[i + 23];
-						= pVideoMemory[i + 21];
+		pVBInfo->XG21_LVDSCapList[k].PSC_S5 = pVideoMemory[i + 24];
-				pVBInfo->XG21_LVDSCapList[k].PSC_S3
+		i += 25;
-						= pVideoMemory[i + 22];
+		j--;
-				pVBInfo->XG21_LVDSCapList[k].PSC_S4
+		k++;
-						= pVideoMemory[i + 23];
+	} while ((j > 0) &&
-				pVBInfo->XG21_LVDSCapList[k].PSC_S5
+		 (k < (sizeof(XGI21_LCDCapList) /
-						= pVideoMemory[i + 24];
+			       sizeof(struct XGI21_LVDSCapStruct))));
-				i += 25;
-				j--;
-				k++;
-			} while ((j > 0) &&
-				 (k < (sizeof(XGI21_LCDCapList) /
-				       sizeof(struct
-						XGI21_LVDSCapStruct))));
-		}
-	}
 }
 static void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension,