From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Mon, 21 Feb 2011 22:14:26 +0000 (+0200)
Subject: staging: xgifb: delete redundant XGIhw_ext fields
X-Git-Tag: v2.6.39-rc1~469^2~427
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f60554cb121b951d250639b01c828cf41aa09da;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

staging: xgifb: delete redundant XGIhw_ext fields

pSR and pCR fields can be deleted with no changes in the functionality.

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 9fdfc54..5e69728 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -3018,22 +3018,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 	/* XGIhw_ext.pQueryNorthBridgeSpace = &XGIfb_query_north_bridge_space; */
 	strcpy(XGIhw_ext.szVBIOSVer, "0.84");
 
-	XGIhw_ext.pSR = vmalloc(sizeof(struct XGI_DSReg) * SR_BUFFER_SIZE);
-	if (XGIhw_ext.pSR == NULL) {
-		printk(KERN_ERR "XGIfb: Fatal error: Allocating SRReg space failed.\n");
-		ret = -ENODEV;
-		goto error;
-	}
-	XGIhw_ext.pSR[0].jIdx = XGIhw_ext.pSR[0].jVal = 0xFF;
-
-	XGIhw_ext.pCR = vmalloc(sizeof(struct XGI_DSReg) * CR_BUFFER_SIZE);
-	if (XGIhw_ext.pCR == NULL) {
-		printk(KERN_ERR "XGIfb: Fatal error: Allocating CRReg space failed.\n");
-		ret = -ENODEV;
-		goto error;
-	}
-	XGIhw_ext.pCR[0].jIdx = XGIhw_ext.pCR[0].jVal = 0xFF;
-
 	if (!XGIvga_enabled) {
 		/* Mapping Max FB Size for 315 Init */
 		XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000);
@@ -3403,8 +3387,6 @@ error_0:
 			   xgi_video_info.video_size);
 error:
 	vfree(XGIhw_ext.pjVirtualRomBase);
-	vfree(XGIhw_ext.pSR);
-	vfree(XGIhw_ext.pCR);
 	framebuffer_release(fb_info);
 	return ret;
 }
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
index 92a9ee5..dacdac3 100644
--- a/drivers/staging/xgifb/vgatypes.h
+++ b/drivers/staging/xgifb/vgatypes.h
@@ -106,16 +106,6 @@ struct xgi_hw_device_info
     unsigned char bIsPowerSaving;     /* True: XGIInit() is invoked by power management,
                                    otherwise by 2nd adapter's initialzation */
 
-    struct XGI_DSReg  *pSR;             /* restore SR registers in initial function. */
-                                 /* end data :(idx, val) =  (FF, FF). */
-                                 /* Note : restore SR registers if  */
-                                 /* bSkipDramSizing = 1 */
-
-    struct XGI_DSReg  *pCR;             /* restore CR registers in initial function. */
-                                 /* end data :(idx, val) =  (FF, FF) */
-                                 /* Note : restore cR registers if  */
-                                 /* bSkipDramSizing = 1 */
-
 	unsigned char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *,
 					    unsigned long, unsigned long,
 					    unsigned long *);