lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: xgifb: delete bIntegratedMMEnabled

Browse Source 
bIntegratedMMEnabled is always true, so the field and checks can be
eliminated.

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-03-08 22:16:11 +02:00
committed by Greg Kroah-Hartman
parent 600a710b8b
commit dbbc2989a7
3 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/xgifb/XGI_main_26.c
View File

@@ -2273,20 +2273,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
printk("XGIfb:chipid = %x\n", xgi_video_info.chip); printk("XGIfb:chipid = %x\n", xgi_video_info.chip);
XGIhw_ext.jChipType = xgi_video_info.chip; XGIhw_ext.jChipType = xgi_video_info.chip;
switch (xgi_video_info.chip) {
case XG40:
case XG41:
case XG42:
case XG45:
case XG20:
case XG21:
case XG27:
XGIhw_ext.bIntegratedMMEnabled = 1;
break;
default:
break;
}
if ((xgi_video_info.chip == XG21) || (XGIfb_userom)) { if ((xgi_video_info.chip == XG21) || (XGIfb_userom)) {
XGIhw_ext.pjVirtualRomBase = xgifb_copy_rom(pdev); XGIhw_ext.pjVirtualRomBase = xgifb_copy_rom(pdev);
if (XGIhw_ext.pjVirtualRomBase) if (XGIhw_ext.pjVirtualRomBase)

3
drivers/staging/xgifb/vb_init.c
View File

@@ -152,9 +152,6 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
pVBInfo->ISXPDOS = 0; pVBInfo->ISXPDOS = 0;
printk("3"); printk("3");
if (!HwDeviceExtension->bIntegratedMMEnabled)
return 0; /* alan */
printk("4"); printk("4");
/* VBIOSVersion[4] = 0x0; */ /* VBIOSVersion[4] = 0x0; */

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

@@ -80,8 +80,6 @@ struct xgi_hw_device_info
unsigned long ulCRT2LCDType; /* defined in the data structure type */ unsigned long ulCRT2LCDType; /* defined in the data structure type */
unsigned char bIntegratedMMEnabled;/* supporting integration MM enable */
unsigned char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *, unsigned char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *,
unsigned long, unsigned long, unsigned long, unsigned long,
unsigned long *); unsigned long *);