staging: xgifb: delete IF_DEF_OEMUtil

Delete already disabled code paths. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
git-mirror · Sep 6, 2011 · 66cface · 66cface
1 parent 09cb8e5
commit 66cface
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 32 deletions.
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
@@ -2612,38 +2612,25 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
 	else
 		modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag;
 
-	if (pVBInfo->IF_DEF_OEMUtil == 1) {
-		tempbx = 8;
-		LCDPtr = (struct XGI330_LCDDataDesStruct *)
-			XGI_GetLcdPtr(tempbx,
-				      ModeNo,
-				      ModeIdIndex,
-				      RefreshRateTableIndex,
-				      pVBInfo);
-	}
-
-	if ((pVBInfo->IF_DEF_OEMUtil == 0) ||
-	    (LCDPtr == NULL)) {
-		tempbx = 3;
-		if (pVBInfo->LCDInfo & EnableScalingLCD)
-			LCDPtr1 =
-			    (struct XGI330_LCDDataDesStruct2 *)
-					XGI_GetLcdPtr(
+	tempbx = 3;
+	if (pVBInfo->LCDInfo & EnableScalingLCD)
+		LCDPtr1 =
+		    (struct XGI330_LCDDataDesStruct2 *)
+				XGI_GetLcdPtr(
+					  tempbx,
+					  ModeNo,
+					  ModeIdIndex,
+					  RefreshRateTableIndex,
+					  pVBInfo);
+	else
+		LCDPtr =
+		    (struct XGI330_LCDDataDesStruct *)
+				XGI_GetLcdPtr(
 					  tempbx,
 					  ModeNo,
 					  ModeIdIndex,
 					  RefreshRateTableIndex,
 					  pVBInfo);
-		else
-			LCDPtr =
-			    (struct XGI330_LCDDataDesStruct *)
-					XGI_GetLcdPtr(
-						  tempbx,
-						  ModeNo,
-						  ModeIdIndex,
-						  RefreshRateTableIndex,
-						  pVBInfo);
-	}
 
 	XGI_GetLCDSync(&tempax, &tempbx, pVBInfo);
 	push1 = tempbx;
@@ -3549,9 +3536,6 @@ unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
 
 	/* End of LCD75 */
 
-	if (pVBInfo->IF_DEF_OEMUtil == 1)
-		pVBInfo->LCDTypeInfo = (temp & 0xf0) >> 4;
-
 	if (!(pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)))
 		return 0;
 
@@ -7827,7 +7811,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
 	pVBInfo->IF_DEF_LVDS = 0;
 	pVBInfo->IF_DEF_LCDA = 1;
 	pVBInfo->IF_DEF_ScaleLCD = 0;
-	pVBInfo->IF_DEF_OEMUtil = 0;
 	pVBInfo->IF_DEF_PWD = 0;
 
 	if (HwDeviceExtension->jChipType >= XG20) { /* kuku 2004/06/25 */

diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
@@ -290,7 +290,7 @@ struct vb_device_info {
 	unsigned short   IF_DEF_LVDS, IF_DEF_TRUMPION, IF_DEF_DSTN;
 	unsigned short   IF_DEF_CRT2Monitor;
 	unsigned short   IF_DEF_LCDA, IF_DEF_YPbPr,
-			 IF_DEF_ScaleLCD, IF_DEF_OEMUtil, IF_DEF_PWD;
+			 IF_DEF_ScaleLCD, IF_DEF_PWD;
 	unsigned short   IF_DEF_ExpLink;
 	unsigned short   IF_DEF_HiVision;
 	unsigned short   LCDResInfo, LCDTypeInfo, VBType;/*301b*/