staging: xgifb: delete dead code for skipping the video memory sizing

Delete dead code for skipping the video memory sizing.

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

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index c77ac4ad5094d5673b959f8e41f523fc32e56359..9fdfc543a92a97da7c0d14d1f4b2e826671e0724 100644 (file)
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -3014,7 +3014,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
                printk(KERN_INFO "XGIfb: Video ROM usage disabled\n");
        }
        XGIhw_ext.pjCustomizedROMImage = NULL;
-       XGIhw_ext.bSkipDramSizing = 0;
        XGIhw_ext.pQueryVGAConfigSpace = &XGIfb_query_VGA_config_space;
        /* XGIhw_ext.pQueryNorthBridgeSpace = &XGIfb_query_north_bridge_space; */
        strcpy(XGIhw_ext.szVBIOSVer, "0.84");

diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 8d591828cee5a341e0d530d7def6c4aaaff79f50..9a5aa6c9f9291451d07607d92321170248666034 100644 (file)
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -120,8 +120,6 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
 
        /* unsigned long j, k; */
 
-       struct XGI_DSReg *pSR;
-
        unsigned long Temp;
 
        pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
@@ -427,24 +425,9 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
 
                XGINew_SetDRAMDefaultRegister340(HwDeviceExtension, pVBInfo->P3d4, pVBInfo);
 
-               if (HwDeviceExtension->bSkipDramSizing == 1) {
-                       pSR = HwDeviceExtension->pSR;
-                       if (pSR != NULL) {
-                               while (pSR->jIdx != 0xFF) {
-                                       XGINew_SetReg1(pVBInfo->P3c4, pSR->jIdx, pSR->jVal);
-                                       pSR++;
-                               }
-                       }
-                       /* XGINew_SetDRAMModeRegister340(pVBInfo); */
-               } /* SkipDramSizing */
-               else {
-                       {
-                               printk("20");
-                               XGINew_SetDRAMSize_340(HwDeviceExtension, pVBInfo);
-                       }
-                       printk("21");
-
-               }
+               printk("20");
+               XGINew_SetDRAMSize_340(HwDeviceExtension, pVBInfo);
+               printk("21");
        } /* XG40 */
 
        printk("22");

diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
index df839eeb5efd0077536024f900010f3366915613..92a9ee5b07ddea0b42b4176b22dbca0ea6da1c3c 100644 (file)
--- a/drivers/staging/xgifb/vgatypes.h
+++ b/drivers/staging/xgifb/vgatypes.h
@@ -101,8 +101,6 @@ struct xgi_hw_device_info
 
     unsigned char bIntegratedMMEnabled;/* supporting integration MM enable */
 
-    unsigned char bSkipDramSizing;     /* True: Skip video memory sizing. */
-
     unsigned char bSkipSense;
 
     unsigned char bIsPowerSaving;     /* True: XGIInit() is invoked by power management,