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>

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 15eb00dce1cb3f160a90af1ee1c3850a9964bd6b..15606eabd0e4d539c42a7f0be0f13d18222503e3 100644 (file)
--- 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
index 2572e5cedde94f5f7270e210b34551f1490a9ccb..3f6c688c88bf1b897277aca148b45bdd3512d36c 100644 (file)
--- 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*/