staging: xgifb: SetFlag: delete EnableChB

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 f3fbd8538282123bf358b5fa25508de24a4c28ca..26a53c438945a1a7d0365a44a0e60d2030ee52b5 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 EnableChB           0x2000
 #define DisableChA          0x4000
 #define EnableChA           0x8000
 

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 6030427e5c6f58c3159041ab0ce40db8134d32f9..29fcf2ca63e5580015659936487d18dff140197a 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -4553,7 +4553,7 @@ static unsigned char XGI_EnableChISLCD(struct vb_device_info *pVBInfo,
        unsigned short tempbx, tempah;
 
        if (enable)
-               tempbx = pVBInfo->SetFlag & (EnableChA | EnableChB);
+               tempbx = pVBInfo->SetFlag & EnableChA;
        else
                tempbx = pVBInfo->SetFlag & DisableChA;
 
@@ -4564,12 +4564,6 @@ static unsigned char XGI_EnableChISLCD(struct vb_device_info *pVBInfo,
                        return 0;
        }
 
-       if (!(tempbx & EnableChB))
-               return 0;
-
-       if (tempah & 0x01) /* Chk LCDB Mode */
-               return 1;
-
        return 0;
 }
 
@@ -5483,9 +5477,8 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info,
                        }
                }
 
-               if ((pVBInfo->SetFlag & EnableChB) ||
-                   (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToTV |
-                                       SetCRT2ToRAMDAC))) {
+               if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToTV |
+                                      SetCRT2ToRAMDAC)) {
                        tempah = xgifb_reg_get(pVBInfo->P3c4, 0x32);
                        tempah &= 0xDF;
                        if (pVBInfo->VBInfo & SetInSlaveMode) {
@@ -5502,7 +5495,7 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info,
                        xgifb_reg_and(pVBInfo->Part1Port, 0x00, 0x7F);
                }
 
-               if ((pVBInfo->SetFlag & (EnableChA | EnableChB))
+               if ((pVBInfo->SetFlag & EnableChA)
                                || (!(pVBInfo->VBInfo & DisableCRT2Display))) {
                        xgifb_reg_and_or(pVBInfo->Part2Port, 0x00, ~0xE0,
                                        0x20); /* shampoo 0129 */
@@ -5537,9 +5530,6 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info,
                                if (pVBInfo->SetFlag &  DisableChA)
                                        tempah &= 0x7F;
 
-                               if (pVBInfo->SetFlag &  EnableChB)
-                                       tempah |= 0x40;
-
                                if (pVBInfo->SetFlag &  EnableChA)
                                        tempah |= 0x80;
                        }