staging: xgifb: delete IF_DEF_PWD

Delete already disabled code paths.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 15606eabd0e4d539c42a7f0be0f13d18222503e3..520747a5aedce633452bfd88015a9efcbbdc75a7 100644 (file)
--- 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 3f6c688c88bf1b897277aca148b45bdd3512d36c..2a38405c467c01eeac4f6b24643f3d4729df4110 100644 (file)
--- 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*/