diff options
| author | Aaro Koskinen | 2011-08-31 20:46:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-09-06 20:42:14 +0200 |
| commit | 66cfacecc3c6c8cdb5d0c6259e2b5d668d264e48 (patch) | |
| tree | 64ca6b8330fb974de0dcc267f70d65def444fb1d /drivers/staging/xgifb | |
| parent | staging: xgifb: delete Win9xDOSMode (diff) | |
| download | kernel-qcow2-linux-66cfacecc3c6c8cdb5d0c6259e2b5d668d264e48.tar.gz kernel-qcow2-linux-66cfacecc3c6c8cdb5d0c6259e2b5d668d264e48.tar.xz kernel-qcow2-linux-66cfacecc3c6c8cdb5d0c6259e2b5d668d264e48.zip | |
staging: xgifb: delete IF_DEF_OEMUtil
Delete already disabled code paths.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb')
| -rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 45 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_struct.h | 2 |
2 files changed, 15 insertions, 32 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 15eb00dce1cb..15606eabd0e4 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -2612,38 +2612,25 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, else modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag; - if (pVBInfo->IF_DEF_OEMUtil == 1) { - tempbx = 8; - LCDPtr = (struct XGI330_LCDDataDesStruct *) - XGI_GetLcdPtr(tempbx, - ModeNo, - ModeIdIndex, - RefreshRateTableIndex, - pVBInfo); - } - - if ((pVBInfo->IF_DEF_OEMUtil == 0) || - (LCDPtr == NULL)) { - tempbx = 3; - if (pVBInfo->LCDInfo & EnableScalingLCD) - LCDPtr1 = - (struct XGI330_LCDDataDesStruct2 *) - XGI_GetLcdPtr( + tempbx = 3; + if (pVBInfo->LCDInfo & EnableScalingLCD) + LCDPtr1 = + (struct XGI330_LCDDataDesStruct2 *) + XGI_GetLcdPtr( + tempbx, + ModeNo, + ModeIdIndex, + RefreshRateTableIndex, + pVBInfo); + else + LCDPtr = + (struct XGI330_LCDDataDesStruct *) + XGI_GetLcdPtr( tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); - else - LCDPtr = - (struct XGI330_LCDDataDesStruct *) - XGI_GetLcdPtr( - tempbx, - ModeNo, - ModeIdIndex, - RefreshRateTableIndex, - pVBInfo); - } XGI_GetLCDSync(&tempax, &tempbx, pVBInfo); push1 = tempbx; @@ -3549,9 +3536,6 @@ unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex, /* End of LCD75 */ - if (pVBInfo->IF_DEF_OEMUtil == 1) - pVBInfo->LCDTypeInfo = (temp & 0xf0) >> 4; - if (!(pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA))) return 0; @@ -7827,7 +7811,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, pVBInfo->IF_DEF_LVDS = 0; pVBInfo->IF_DEF_LCDA = 1; pVBInfo->IF_DEF_ScaleLCD = 0; - pVBInfo->IF_DEF_OEMUtil = 0; pVBInfo->IF_DEF_PWD = 0; if (HwDeviceExtension->jChipType >= XG20) { /* kuku 2004/06/25 */ diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 2572e5cedde9..3f6c688c88bf 100644 --- a/drivers/staging/xgifb/vb_struct.h +++ b/drivers/staging/xgifb/vb_struct.h @@ -290,7 +290,7 @@ struct vb_device_info { unsigned short IF_DEF_LVDS, IF_DEF_TRUMPION, IF_DEF_DSTN; unsigned short IF_DEF_CRT2Monitor; unsigned short IF_DEF_LCDA, IF_DEF_YPbPr, - IF_DEF_ScaleLCD, IF_DEF_OEMUtil, IF_DEF_PWD; + IF_DEF_ScaleLCD, IF_DEF_PWD; unsigned short IF_DEF_ExpLink; unsigned short IF_DEF_HiVision; unsigned short LCDResInfo, LCDTypeInfo, VBType;/*301b*/ |