mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-26 19:00:25 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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:
Aaro Koskinen 2011-02-22 00:14:25 +02:00 committed by Greg Kroah-Hartman
parent da1545c0f2
commit 7bc5e8374f
3 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/xgifb/XGI_main_26.c
View file

@ -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");

23
drivers/staging/xgifb/vb_init.c
View file

@ -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");

2
drivers/staging/xgifb/vgatypes.h
View file

@ -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,