diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-05-29 23:59:08 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-30 20:55:51 +0900 |
| commit | b8e34b3ffaa659d12a1978f033fbab123aff1976 (patch) | |
| tree | e873806998051c356c926da2c7b0f8599a0a1960 /drivers/staging/xgifb | |
| parent | c4f9c31ebe8d730e2061be40fc3962d27805ce2d (diff) | |
| download | blackbird-op-linux-b8e34b3ffaa659d12a1978f033fbab123aff1976.tar.gz blackbird-op-linux-b8e34b3ffaa659d12a1978f033fbab123aff1976.zip | |
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>
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 | 18 |
2 files changed, 4 insertions, 15 deletions
diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h index f3fbd8538282..26a53c438945 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 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 6030427e5c6f..29fcf2ca63e5 100644 --- 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; } |
