Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f60554c authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: delete redundant XGIhw_ext fields 



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

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7bc5e837

drivers/staging/xgifb/XGI_main_26.c

+0 −18
Original line number Diff line number Diff line
@@ -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 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, 
			   xgi_video_info.video_size);

error:

	vfree(XGIhw_ext.pjVirtualRomBase);

	vfree(XGIhw_ext.pSR);

	vfree(XGIhw_ext.pCR);

	framebuffer_release(fb_info);

	return ret;

}

drivers/staging/xgifb/vgatypes.h

+0 −10
Original line number Diff line number Diff line
@@ -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 *);