2011-02-21 22:14:21

by Aaro Koskinen

Subject: [PATCH 1/2] 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 <[email protected]>
---
drivers/staging/xgifb/XGI_main_26.c | 1 -
drivers/staging/xgifb/vb_init.c | 23 +++--------------------
drivers/staging/xgifb/vgatypes.h | 2 --
3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 7f821ae..c6ae792 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -3025,7 +3025,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 8d59182..9a5aa6c 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 df839ee..92a9ee5 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,
--
1.5.6.5

2011-02-21 22:14:22

by Aaro Koskinen

Subject: [PATCH 2/2] 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 <[email protected]>
---
drivers/staging/xgifb/XGI_main_26.c | 18 ------------------
drivers/staging/xgifb/vgatypes.h | 10 ----------
2 files changed, 0 insertions(+), 28 deletions(-)

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index c6ae792..8606e32 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -3029,22 +3029,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);
@@ -3419,8 +3403,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 *);
--
1.5.6.5