From dbbc2989a78872922601791983762c207a60f38c Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Tue, 8 Mar 2011 22:16:11 +0200 Subject: [PATCH] staging: xgifb: delete bIntegratedMMEnabled bIntegratedMMEnabled is always true, so the field and checks can be eliminated. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/xgifb/XGI_main_26.c | 14 -------------- drivers/staging/xgifb/vb_init.c | 3 --- drivers/staging/xgifb/vgatypes.h | 2 -- 3 files changed, 19 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index fa30a2614b07..ce569af3781b 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -2273,20 +2273,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, printk("XGIfb:chipid = %x\n", 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)) { XGIhw_ext.pjVirtualRomBase = xgifb_copy_rom(pdev); if (XGIhw_ext.pjVirtualRomBase) diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index e33259a5e860..a16827e3e869 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -152,9 +152,6 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension) pVBInfo->ISXPDOS = 0; printk("3"); - if (!HwDeviceExtension->bIntegratedMMEnabled) - return 0; /* alan */ - printk("4"); /* VBIOSVersion[4] = 0x0; */ diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h index c4624ccb02b7..4b87951f4322 100644 --- a/drivers/staging/xgifb/vgatypes.h +++ b/drivers/staging/xgifb/vgatypes.h @@ -80,8 +80,6 @@ struct xgi_hw_device_info 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 long, unsigned long, unsigned long *); -- 2.34.1