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

staging: xgifb: delete redundant XGIhw_ext fields

Browse Source 
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>
This commit is contained in:
Aaro Koskinen
2011-02-22 00:14:26 +02:00
committed by Greg Kroah-Hartman
parent 7bc5e8374f
commit 3f60554cb1
2 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3018,22 +3018,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
/* XGIhw_ext.pQueryNorthBridgeSpace = &XGIfb_query_north_bridge_space; */ /* XGIhw_ext.pQueryNorthBridgeSpace = &XGIfb_query_north_bridge_space; */
strcpy(XGIhw_ext.szVBIOSVer, "0.84"); 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) { if (!XGIvga_enabled) {
/* Mapping Max FB Size for 315 Init */ /* Mapping Max FB Size for 315 Init */
XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000); XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000);
@@ -3403,8 +3387,6 @@ error_0:
xgi_video_info.video_size); xgi_video_info.video_size);
error: error:
vfree(XGIhw_ext.pjVirtualRomBase); vfree(XGIhw_ext.pjVirtualRomBase);
vfree(XGIhw_ext.pSR);
vfree(XGIhw_ext.pCR);
framebuffer_release(fb_info); framebuffer_release(fb_info);
return ret; return ret;
} }

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

@@ -106,16 +106,6 @@ struct xgi_hw_device_info
unsigned char bIsPowerSaving; /* True: XGIInit() is invoked by power management, unsigned char bIsPowerSaving; /* True: XGIInit() is invoked by power management,
otherwise by 2nd adapter's initialzation */ 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 char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *,
unsigned long, unsigned long, unsigned long, unsigned long,
unsigned long *); unsigned long *);