mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
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>
This commit is contained in:
parent
da1545c0f2
commit
7bc5e8374f
3 changed files with 3 additions and 23 deletions
|
@ -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");
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue