diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-05-29 20:59:07 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-30 11:55:50 (GMT) |
commit | c4f9c31ebe8d730e2061be40fc3962d27805ce2d (patch) | |
tree | dc900086cc472592370e658f896125e27d9c14e3 /drivers/staging/xgifb | |
parent | ae424a3d6e2544d36ac9da952098f262599fca8d (diff) | |
download | linux-c4f9c31ebe8d730e2061be40fc3962d27805ce2d.tar.xz |
staging: xgifb: SetFlag: delete DisableChB
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>
Diffstat (limited to 'drivers/staging/xgifb')
-rw-r--r-- | drivers/staging/xgifb/vb_def.h | 1 | ||||
-rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 52 |
2 files changed, 19 insertions, 34 deletions
diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h index cd082ca..f3fbd85 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 DisableChB 0x1000 #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 78fcf0b..6030427 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -4555,7 +4555,7 @@ static unsigned char XGI_EnableChISLCD(struct vb_device_info *pVBInfo, if (enable) tempbx = pVBInfo->SetFlag & (EnableChA | EnableChB); else - tempbx = pVBInfo->SetFlag & (DisableChA | DisableChB); + tempbx = pVBInfo->SetFlag & DisableChA; tempah = ~((unsigned short) xgifb_reg_get(pVBInfo->Part1Port, 0x2E)); @@ -4564,7 +4564,7 @@ static unsigned char XGI_EnableChISLCD(struct vb_device_info *pVBInfo, return 0; } - if (!(tempbx & (EnableChB | DisableChB))) + if (!(tempbx & EnableChB)) return 0; if (tempah & 0x01) /* Chk LCDB Mode */ @@ -4592,10 +4592,6 @@ static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info, /* Disable Channel B */ tempah = 0xBF; - if (pVBInfo->SetFlag & DisableChB) - /* force to disable Cahnnel */ - tempah &= 0xBF; - if (pVBInfo->SetFlag & DisableChA) /* Force to disable Channel B */ tempah &= 0x7F; @@ -4633,16 +4629,14 @@ static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info, if ((pVBInfo->VBInfo & (SetSimuScanMode | SetCRT2ToDualEdge))) xgifb_reg_and(pVBInfo->Part2Port, 0x00, 0xdf); - if ((pVBInfo->SetFlag & DisableChB) || - (pVBInfo->VBInfo & + if ((pVBInfo->VBInfo & (DisableCRT2Display | SetSimuScanMode)) || ((!(pVBInfo->VBInfo & XGI_SetCRT2ToLCDA)) && (pVBInfo->VBInfo & (SetCRT2ToRAMDAC | SetCRT2ToLCD | SetCRT2ToTV)))) xgifb_reg_or(pVBInfo->Part1Port, 0x00, 0x80); - if ((pVBInfo->SetFlag & DisableChB) || - (pVBInfo->VBInfo & + if ((pVBInfo->VBInfo & (DisableCRT2Display | SetSimuScanMode)) || (!(pVBInfo->VBInfo & XGI_SetCRT2ToLCDA)) || (pVBInfo->VBInfo & @@ -5489,28 +5483,23 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info, } } - if (!(pVBInfo->SetFlag & DisableChB)) { - if ((pVBInfo->SetFlag & EnableChB) || (pVBInfo->VBInfo - & (SetCRT2ToLCD | SetCRT2ToTV - | SetCRT2ToRAMDAC))) { - tempah = xgifb_reg_get(pVBInfo->P3c4, 0x32); - tempah &= 0xDF; - if (pVBInfo->VBInfo & SetInSlaveMode) { - if (!(pVBInfo->VBInfo & - SetCRT2ToRAMDAC)) - tempah |= 0x20; - } - xgifb_reg_set(pVBInfo->P3c4, 0x32, tempah); - xgifb_reg_or(pVBInfo->P3c4, 0x1E, 0x20); + if ((pVBInfo->SetFlag & EnableChB) || + (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToTV | + SetCRT2ToRAMDAC))) { + tempah = xgifb_reg_get(pVBInfo->P3c4, 0x32); + tempah &= 0xDF; + if (pVBInfo->VBInfo & SetInSlaveMode) { + if (!(pVBInfo->VBInfo & SetCRT2ToRAMDAC)) + tempah |= 0x20; + } + xgifb_reg_set(pVBInfo->P3c4, 0x32, tempah); + xgifb_reg_or(pVBInfo->P3c4, 0x1E, 0x20); - tempah = xgifb_reg_get(pVBInfo->Part1Port, - 0x2E); + tempah = xgifb_reg_get(pVBInfo->Part1Port, 0x2E); - if (!(tempah & 0x80)) - xgifb_reg_or(pVBInfo->Part1Port, - 0x2E, 0x80); - xgifb_reg_and(pVBInfo->Part1Port, 0x00, 0x7F); - } + if (!(tempah & 0x80)) + xgifb_reg_or(pVBInfo->Part1Port, 0x2E, 0x80); + xgifb_reg_and(pVBInfo->Part1Port, 0x00, 0x7F); } if ((pVBInfo->SetFlag & (EnableChA | EnableChB)) @@ -5545,9 +5534,6 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info, if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) tempah = tempah ^ 0xC0; - if (pVBInfo->SetFlag & DisableChB) - tempah &= 0xBF; - if (pVBInfo->SetFlag & DisableChA) tempah &= 0x7F; |