Commit 7bc5e837 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

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

Delete dead code for skipping the video memory sizing.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent da1545c0
...@@ -3014,7 +3014,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, ...@@ -3014,7 +3014,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
printk(KERN_INFO "XGIfb: Video ROM usage disabled\n"); printk(KERN_INFO "XGIfb: Video ROM usage disabled\n");
} }
XGIhw_ext.pjCustomizedROMImage = NULL; XGIhw_ext.pjCustomizedROMImage = NULL;
XGIhw_ext.bSkipDramSizing = 0;
XGIhw_ext.pQueryVGAConfigSpace = &XGIfb_query_VGA_config_space; XGIhw_ext.pQueryVGAConfigSpace = &XGIfb_query_VGA_config_space;
/* XGIhw_ext.pQueryNorthBridgeSpace = &XGIfb_query_north_bridge_space; */ /* XGIhw_ext.pQueryNorthBridgeSpace = &XGIfb_query_north_bridge_space; */
strcpy(XGIhw_ext.szVBIOSVer, "0.84"); strcpy(XGIhw_ext.szVBIOSVer, "0.84");
......
...@@ -120,8 +120,6 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension) ...@@ -120,8 +120,6 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
/* unsigned long j, k; */ /* unsigned long j, k; */
struct XGI_DSReg *pSR;
unsigned long Temp; unsigned long Temp;
pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase; pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
...@@ -427,24 +425,9 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension) ...@@ -427,24 +425,9 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
XGINew_SetDRAMDefaultRegister340(HwDeviceExtension, pVBInfo->P3d4, pVBInfo); XGINew_SetDRAMDefaultRegister340(HwDeviceExtension, pVBInfo->P3d4, pVBInfo);
if (HwDeviceExtension->bSkipDramSizing == 1) { printk("20");
pSR = HwDeviceExtension->pSR; XGINew_SetDRAMSize_340(HwDeviceExtension, pVBInfo);
if (pSR != NULL) { printk("21");
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");
}
} /* XG40 */ } /* XG40 */
printk("22"); printk("22");
......
...@@ -101,8 +101,6 @@ struct xgi_hw_device_info ...@@ -101,8 +101,6 @@ struct xgi_hw_device_info
unsigned char bIntegratedMMEnabled;/* supporting integration MM enable */ unsigned char bIntegratedMMEnabled;/* supporting integration MM enable */
unsigned char bSkipDramSizing; /* True: Skip video memory sizing. */
unsigned char bSkipSense; unsigned char bSkipSense;
unsigned char bIsPowerSaving; /* True: XGIInit() is invoked by power management, unsigned char bIsPowerSaving; /* True: XGIInit() is invoked by power management,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment