From: Aaro Koskinen Date: Wed, 31 Aug 2011 18:46:14 +0000 (+0300) Subject: staging: xgifb: delete IF_DEF_PWD X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3d6defaddaea531e37fb2e9a425668d387229809;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git staging: xgifb: delete IF_DEF_PWD Delete already disabled code paths. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 15606eabd0e4..520747a5aedc 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -3602,16 +3602,6 @@ unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex, pVBInfo->LCDInfo = tempbx; - if (pVBInfo->IF_DEF_PWD == 1) { - if (pVBInfo->LCDInfo & SetPWDEnable) { - if ((pVBInfo->VBType & VB_XGI302LV) || - (pVBInfo->VBType & VB_XGI301C)) { - if (!(tempax & PWDEnable)) - pVBInfo->LCDInfo &= ~SetPWDEnable; - } - } - } - if (pVBInfo->IF_DEF_LVDS == 0) { if (tempax & (LockLCDBToA | StLCDBToA)) { if (pVBInfo->VBInfo & SetInSlaveMode) { @@ -7811,7 +7801,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_PWD = 0; if (HwDeviceExtension->jChipType >= XG20) { /* kuku 2004/06/25 */ pVBInfo->IF_DEF_YPbPr = 0; diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 3f6c688c88bf..2a38405c467c 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_PWD; + IF_DEF_ScaleLCD; unsigned short IF_DEF_ExpLink; unsigned short IF_DEF_HiVision; unsigned short LCDResInfo, LCDTypeInfo, VBType;/*301b*/