staging: xgifb: delete ROMAddr (f7054c2a) · Commits · 戴 / test

drivers/staging/xgifb/XGI_main_26.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -156,7 +156,6 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,

		/* unsigned long temp = 0; */
		int Clock;
		XGI_Pr->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
		InitTo330Pointer(HwDeviceExtension->jChipType, XGI_Pr);

		RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
		@@ -196,7 +195,6 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
		unsigned char sr_data, cr_data, cr_data2;
		unsigned long cr_data3;
		int A, B, C, D, E, F, temp, j;
		XGI_Pr->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
		InitTo330Pointer(HwDeviceExtension->jChipType, XGI_Pr);
		RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
		ModeIdIndex, XGI_Pr);

+0 −10

Original line number	Diff line number	Diff line
		@@ -1075,7 +1075,6 @@ static void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *HwDeviceExtension,
		{
		unsigned short data;

		pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
		pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress;

		XGISetModeNew(HwDeviceExtension, 0x2e);
		@@ -1453,24 +1452,15 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
		struct vb_device_info *pVBInfo = &VBINF;
		unsigned char i, temp = 0, temp1;
		/* VBIOSVersion[5]; */
		volatile unsigned char *pVideoMemory;

		/* unsigned long j, k; */

		pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase;

		pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress;

		pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;

		pVideoMemory = (unsigned char *) pVBInfo->ROMAddr;

		/* Newdebugcode(0x99); */


		/* if (pVBInfo->ROMAddr == 0) */
		/* return(0); */

		if (pVBInfo->FBAddr == NULL) {
		printk("\n pVBInfo->FBAddr == 0 ");
		return 0;

+0 −1

Original line number	Diff line number	Diff line
		@@ -7409,7 +7409,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
		unsigned short ModeIdIndex;
		struct vb_device_info VBINF;
		struct vb_device_info *pVBInfo = &VBINF;
		pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
		pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;
		pVBInfo->IF_DEF_LVDS = 0;
		pVBInfo->IF_DEF_LCDA = 1;

+0 −1

Original line number	Diff line number	Diff line
		@@ -299,7 +299,6 @@ struct vb_device_info {
		unsigned short NewFlickerMode;
		unsigned short SelectCRT2Rate;

		unsigned char *ROMAddr;
		void __iomem *FBAddr;
		unsigned long BaseAddr;
		unsigned long RelIO;