staging: xgifb: SetFlag: delete GatingCRT

This flag is never set, so checks can be removed and code behind it
deleted.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h
index 80c972305885babd09f61a0c1db00ddae2b0475d..cd082cae854dcc337f546542ae6096d4a13761c2 100644 (file)
--- a/drivers/staging/xgifb/vb_def.h
+++ b/drivers/staging/xgifb/vb_def.h
@@ -30,7 +30,6 @@
 #define SetCRT2ToDualEdge   0x8000
 
 #define ReserveTVOption     0x0008
-#define GatingCRT           0x0800
 #define DisableChB          0x1000
 #define EnableChB           0x2000
 #define DisableChA          0x4000

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 69b6a960888d79a39005c2a63bd129f38ab060ae..78fcf0bbbd1928aba38801f71ba67a2ed9436d86 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -4283,12 +4283,6 @@ static void XGI_SetGroup5(unsigned short ModeNo, unsigned short ModeIdIndex,
        return;
 }
 
-static void XGI_EnableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension,
-               struct vb_device_info *pVBInfo)
-{
-       xgifb_reg_and_or(pVBInfo->P3d4, 0x63, 0xBF, 0x40);
-}
-
 static void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension,
                struct vb_device_info *pVBInfo)
 {
@@ -4623,11 +4617,8 @@ static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info,
 
                if ((pVBInfo->SetFlag & DisableChA) || (pVBInfo->VBInfo
                                & (DisableCRT2Display | XGI_SetCRT2ToLCDA
-                                               | SetSimuScanMode))) {
-                       if (pVBInfo->SetFlag & GatingCRT)
-                               XGI_EnableGatingCRT(HwDeviceExtension, pVBInfo);
+                                               | SetSimuScanMode)))
                        XGI_DisplayOff(xgifb_info, HwDeviceExtension, pVBInfo);
-               }
 
                if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {
                        if ((pVBInfo->SetFlag & DisableChA) || (pVBInfo->VBInfo
@@ -5572,12 +5563,8 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info,
                xgifb_reg_or(pVBInfo->Part4Port, 0x1F, tempah);
 
                if (!(pVBInfo->SetFlag & DisableChA)) {
-                       if (!(pVBInfo->SetFlag & GatingCRT)) {
-                               XGI_DisableGatingCRT(HwDeviceExtension,
-                                                    pVBInfo);
-                               XGI_DisplayOn(xgifb_info, HwDeviceExtension,
-                                               pVBInfo);
-                       }
+                       XGI_DisableGatingCRT(HwDeviceExtension, pVBInfo);
+                       XGI_DisplayOn(xgifb_info, HwDeviceExtension, pVBInfo);
                }
        } /* 301 */
        else { /* LVDS */