diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-05-29 23:59:16 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-30 20:55:53 +0900 |
| commit | ee76875ea54f22f81b857b4617f9b608c4cde64c (patch) | |
| tree | 32345e87c75b14d39a1e4111aa1025f038eb1193 /drivers/staging/xgifb | |
| parent | aee0ac92f474881c7b23a7452e4280bad7b00f6f (diff) | |
staging: xgifb: vb_setmode: delete IF_DEF_CRT2Monitor checks
Code checking for IF_DEF_CRT2Monitor is only executed for chips < XG20,
and there IF_DEF_CRT2Monitor is always true, so the flag is redundant.
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_setmode.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 910a2e1ed423..fcefe5b36cdd 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -1997,15 +1997,10 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, /* shampoo add */ /* for driver abnormal */ if (!(tempbx & (SwitchCRT2 | SetSimuScanMode))) { - if (pVBInfo->IF_DEF_CRT2Monitor == 1) { - if (tempbx & SetCRT2ToRAMDAC) { - tempbx &= (0xFF00 | SetCRT2ToRAMDAC | - SwitchCRT2 | SetSimuScanMode); - tempbx &= (0x00FF | (~SetCRT2ToYPbPr525750)); - } - } else { - tempbx &= (~(SetCRT2ToRAMDAC | SetCRT2ToLCD | - SetCRT2ToTV)); + if (tempbx & SetCRT2ToRAMDAC) { + tempbx &= (0xFF00 | SetCRT2ToRAMDAC | + SwitchCRT2 | SetSimuScanMode); + tempbx &= (0x00FF | (~SetCRT2ToYPbPr525750)); } } @@ -5550,12 +5545,8 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info, struct vb_device_info *pVBInfo = &VBINF; pVBInfo->IF_DEF_LVDS = 0; - if (HwDeviceExtension->jChipType >= XG20) { - pVBInfo->IF_DEF_CRT2Monitor = 0; + if (HwDeviceExtension->jChipType >= XG20) pVBInfo->VBType = 0; /*set VBType default 0*/ - } else { - pVBInfo->IF_DEF_CRT2Monitor = 1; - } XGIRegInit(pVBInfo, xgifb_info->vga_base); |