From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Mon, 21 Feb 2011 22:14:25 +0000 (+0200)
Subject: staging: xgifb: delete dead code for skipping the video memory sizing
X-Git-Tag: MMI-PSA29.97-13-9~20521^2~428
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7bc5e8374f22c46e6326ab219c45e75867dc9acd;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index c77ac4ad5094..9fdfc543a92a 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -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");
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 8d591828cee5..9a5aa6c9f929 100644
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -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");
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
index df839eeb5efd..92a9ee5b07dd 100644
--- a/drivers/staging/xgifb/vgatypes.h
+++ b/drivers/staging/xgifb/vgatypes.h
@@ -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,