diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-05-29 23:59:09 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-30 20:55:51 +0900 |
| commit | d1724637e1b33dd4f53c1d75d6f5e22a7c8a2f5c (patch) | |
| tree | cbed5f4ef77d202b7be44f0f43112f78f90f8f38 | |
| parent | b8e34b3ffaa659d12a1978f033fbab123aff1976 (diff) | |
staging: xgifb: SetFlag: delete DisableChA
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>
| -rw-r--r-- | drivers/staging/xgifb/vb_def.h | 1 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 35 |
2 files changed, 11 insertions, 25 deletions
diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h index 26a53c438945..6bc20e9803df 100644 --- 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 DisableChA 0x4000 #define EnableChA 0x8000 #define SetTVLowResolution 0x0400 diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 29fcf2ca63e5..41f29a3821dc 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -4555,11 +4555,11 @@ static unsigned char XGI_EnableChISLCD(struct vb_device_info *pVBInfo, if (enable) tempbx = pVBInfo->SetFlag & EnableChA; else - tempbx = pVBInfo->SetFlag & DisableChA; + tempbx = 0; tempah = ~((unsigned short) xgifb_reg_get(pVBInfo->Part1Port, 0x2E)); - if (tempbx & (EnableChA | DisableChA)) { + if (tempbx & EnableChA) { if (!(tempah & 0x08)) /* Chk LCDA Mode */ return 0; } @@ -4585,10 +4585,6 @@ static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info, XGI_SetCRT2ToLCDA)) /* Disable Channel B */ tempah = 0xBF; - - if (pVBInfo->SetFlag & DisableChA) - /* Force to disable Channel B */ - tempah &= 0x7F; } } } @@ -4605,14 +4601,12 @@ static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info, xgifb_reg_or(pVBInfo->Part4Port, 0x30, 0x80); } - if ((pVBInfo->SetFlag & DisableChA) || (pVBInfo->VBInfo - & (DisableCRT2Display | XGI_SetCRT2ToLCDA - | SetSimuScanMode))) + if (pVBInfo->VBInfo & (DisableCRT2Display | XGI_SetCRT2ToLCDA | + SetSimuScanMode)) XGI_DisplayOff(xgifb_info, HwDeviceExtension, pVBInfo); if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) { - if ((pVBInfo->SetFlag & DisableChA) || (pVBInfo->VBInfo - & XGI_SetCRT2ToLCDA)) + if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) /* Power down */ xgifb_reg_and(pVBInfo->Part1Port, 0x1e, 0xdf); } @@ -5469,12 +5463,10 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info, if (pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV | VB_SIS302LV | VB_XGI301C)) { - if (!(pVBInfo->SetFlag & DisableChA)) { - if ((pVBInfo->SetFlag & EnableChA) || - (pVBInfo->VBInfo & SetCRT2ToDualEdge)) { - /* Power on */ - xgifb_reg_set(pVBInfo->Part1Port, 0x1E, 0x20); - } + if ((pVBInfo->SetFlag & EnableChA) || + (pVBInfo->VBInfo & SetCRT2ToDualEdge)) { + /* Power on */ + xgifb_reg_set(pVBInfo->Part1Port, 0x1E, 0x20); } if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToTV | @@ -5527,9 +5519,6 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info, if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) tempah = tempah ^ 0xC0; - if (pVBInfo->SetFlag & DisableChA) - tempah &= 0x7F; - if (pVBInfo->SetFlag & EnableChA) tempah |= 0x80; } @@ -5538,10 +5527,8 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info, /* EnablePart4_1F */ xgifb_reg_or(pVBInfo->Part4Port, 0x1F, tempah); - if (!(pVBInfo->SetFlag & DisableChA)) { - XGI_DisableGatingCRT(HwDeviceExtension, pVBInfo); - XGI_DisplayOn(xgifb_info, HwDeviceExtension, pVBInfo); - } + XGI_DisableGatingCRT(HwDeviceExtension, pVBInfo); + XGI_DisplayOn(xgifb_info, HwDeviceExtension, pVBInfo); } /* 301 */ else { /* LVDS */ if (pVBInfo->VBInfo & (SetCRT2ToTV | SetCRT2ToLCD |