staging: xgifb: delete bSkipSense

bSkipSense is always false, thus redundant.

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

2 files changed, 21 insertions, 25 deletions

diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 9a5aa6c9f92..e33259a5e86 100644
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -388,34 +388,32 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
                 XGINew_SetReg1(pVBInfo->P3d4, 0x83, 0x00);
         printk("181");
 
-        if (HwDeviceExtension->bSkipSense == 0) {
-                printk("182");
+        printk("182");
 
-                XGI_SenseCRT1(pVBInfo);
+        XGI_SenseCRT1(pVBInfo);
 
-                printk("183");
-                /* XGINew_DetectMonitor(HwDeviceExtension); */
-                pVBInfo->IF_DEF_CH7007 = 0;
-                if ((HwDeviceExtension->jChipType == XG21) && (pVBInfo->IF_DEF_CH7007)) {
-                        printk("184");
-                        XGI_GetSenseStatus(HwDeviceExtension, pVBInfo); /* sense CRT2 */
-                        printk("185");
+        printk("183");
+        /* XGINew_DetectMonitor(HwDeviceExtension); */
+        pVBInfo->IF_DEF_CH7007 = 0;
+        if ((HwDeviceExtension->jChipType == XG21) && (pVBInfo->IF_DEF_CH7007)) {
+                printk("184");
+                XGI_GetSenseStatus(HwDeviceExtension, pVBInfo); /* sense CRT2 */
+                printk("185");
 
-                }
-                if (HwDeviceExtension->jChipType == XG21) {
-                        printk("186");
+        }
+        if (HwDeviceExtension->jChipType == XG21) {
+                printk("186");
 
-                        XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
-                        temp = GetXG21FPBits(pVBInfo);
-                        XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x01, temp);
-                        printk("187");
+                XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
+                temp = GetXG21FPBits(pVBInfo);
+                XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x01, temp);
+                printk("187");
 
-                }
-                if (HwDeviceExtension->jChipType == XG27) {
-                        XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
-                        temp = GetXG27FPBits(pVBInfo);
-                        XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x03, temp);
-                }
+        }
+        if (HwDeviceExtension->jChipType == XG27) {
+                XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
+                temp = GetXG27FPBits(pVBInfo);
+                XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x03, temp);
         }
         printk("19");
 
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
index 13c02be3813..c4624ccb02b 100644
--- a/drivers/staging/xgifb/vgatypes.h
+++ b/drivers/staging/xgifb/vgatypes.h
@@ -82,8 +82,6 @@ struct xgi_hw_device_info
 
     unsigned char bIntegratedMMEnabled;/* supporting integration MM enable */
 
-    unsigned char bSkipSense;
-
         unsigned char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *,
                                             unsigned long, unsigned long,
                                             unsigned long *);