staging: xgifb: delete IF_DEF_VideoCapture

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_def.h b/drivers/staging/xgifb/vb_def.h
index fab44146de0c61c3a524b9d6ac07a93c5d41bb24..00cdcb9cc698bab23f16b40e1fdef121519513e8 100644 (file)
--- a/drivers/staging/xgifb/vb_def.h
+++ b/drivers/staging/xgifb/vb_def.h
@@ -148,7 +148,6 @@
 #define SetCRT2ToDualEdge   0x8000
 
 #define ProgrammingCRT2     0x0001       /* Set Flag */
-#define EnableVCMode        0x0002
 #define ReserveTVOption     0x0008
 #define Win9xDOSMode        0x0020
 #define GatingCRT           0x0800

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 100f63f04270c24a18c770d7998029809f11b5a2..dc344f2efbbbe04e3b3bf207663eadea788b66fb 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -3379,34 +3379,6 @@ void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
                                                tempbx |= (SetInSlaveMode |
                                                           SetSimuScanMode);
                                }
-
-                               if (pVBInfo->IF_DEF_VideoCapture == 1) {
-                                       if (((HwDeviceExtension->jChipType ==
-                                             XG40) &&
-                                            (pVBInfo->Set_VGAType == XG40)) ||
-                                           ((HwDeviceExtension->jChipType ==
-                                             XG41) &&
-                                            (pVBInfo->Set_VGAType == XG41)) ||
-                                           ((HwDeviceExtension->jChipType ==
-                                             XG42) &&
-                                            (pVBInfo->Set_VGAType == XG42)) ||
-                                           ((HwDeviceExtension->jChipType ==
-                                             XG45) &&
-                                            (pVBInfo->Set_VGAType == XG45))) {
-                                               if (ModeNo <= 13) {
-                                                       if (!(tempbx &
-                                                            SetCRT2ToRAMDAC)) {
-                                                               /*CRT2 not need
-                                                                * to support*/
-                                                               tempbx &=
-                                                                 (0x00FF |
-                                                                 (~SetInSlaveMode));
-                                                               pVBInfo->SetFlag
-                                                                               |= EnableVCMode;
-                                                       }
-                                               }
-                                       }
-                               }
                        }
 
                        /* LCD+TV can't support in slave mode
@@ -7878,7 +7850,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
        pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;
        pVBInfo->IF_DEF_LVDS = 0;
        pVBInfo->IF_DEF_LCDA = 1;
-       pVBInfo->IF_DEF_VideoCapture = 0;
        pVBInfo->IF_DEF_ScaleLCD = 0;
        pVBInfo->IF_DEF_OEMUtil = 0;
        pVBInfo->IF_DEF_PWD = 0;

diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index 3cb2e7e1b3b2aaa6b412188623e315956897d832..2572e5cedde94f5f7270e210b34551f1490a9ccb 100644 (file)
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -288,7 +288,7 @@ struct vb_device_info {
        unsigned short   ModeType;
        /* ,IF_DEF_FSTN; add for dstn */
        unsigned short   IF_DEF_LVDS, IF_DEF_TRUMPION, IF_DEF_DSTN;
-       unsigned short   IF_DEF_CRT2Monitor, IF_DEF_VideoCapture;
+       unsigned short   IF_DEF_CRT2Monitor;
        unsigned short   IF_DEF_LCDA, IF_DEF_YPbPr,
                         IF_DEF_ScaleLCD, IF_DEF_OEMUtil, IF_DEF_PWD;
        unsigned short   IF_DEF_ExpLink;