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

Commit 7bc5e837 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: delete dead code for skipping the video memory sizing 



Delete dead code for skipping the video memory sizing.

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

drivers/staging/xgifb/XGI_main_26.c

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

drivers/staging/xgifb/vb_init.c

+3 −20
Original line number Diff line number Diff line
@@ -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");



		}

	} /* XG40 */



	printk("22");

drivers/staging/xgifb/vgatypes.h

+0 −2
Original line number Diff line number Diff line
@@ -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,