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

Commit 66cfacec authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: delete IF_DEF_OEMUtil 



Delete already disabled code paths.

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

drivers/staging/xgifb/vb_setmode.c

+14 −31
Original line number Diff line number Diff line
@@ -2612,18 +2612,6 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, 
	else

		modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag;



	if (pVBInfo->IF_DEF_OEMUtil == 1) {

		tempbx = 8;

		LCDPtr = (struct XGI330_LCDDataDesStruct *)

			XGI_GetLcdPtr(tempbx,

				      ModeNo,

				      ModeIdIndex,

				      RefreshRateTableIndex,

				      pVBInfo);

	}



	if ((pVBInfo->IF_DEF_OEMUtil == 0) ||

	    (LCDPtr == NULL)) {

	tempbx = 3;

	if (pVBInfo->LCDInfo & EnableScalingLCD)

		LCDPtr1 =
@@ -2643,7 +2631,6 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, 
					  ModeIdIndex,

					  RefreshRateTableIndex,

					  pVBInfo);

	}



	XGI_GetLCDSync(&tempax, &tempbx, pVBInfo);

	push1 = tempbx;
@@ -3549,9 +3536,6 @@ unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 


	/* End of LCD75 */



	if (pVBInfo->IF_DEF_OEMUtil == 1)

		pVBInfo->LCDTypeInfo = (temp & 0xf0) >> 4;



	if (!(pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)))

		return 0;
@@ -7827,7 +7811,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, 
	pVBInfo->IF_DEF_LVDS = 0;

	pVBInfo->IF_DEF_LCDA = 1;

	pVBInfo->IF_DEF_ScaleLCD = 0;

	pVBInfo->IF_DEF_OEMUtil = 0;

	pVBInfo->IF_DEF_PWD = 0;



	if (HwDeviceExtension->jChipType >= XG20) { /* kuku 2004/06/25 */

drivers/staging/xgifb/vb_struct.h

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ struct vb_device_info { 
	unsigned short   IF_DEF_LVDS, IF_DEF_TRUMPION, IF_DEF_DSTN;

	unsigned short   IF_DEF_CRT2Monitor;

	unsigned short   IF_DEF_LCDA, IF_DEF_YPbPr,

			 IF_DEF_ScaleLCD, IF_DEF_OEMUtil, IF_DEF_PWD;

			 IF_DEF_ScaleLCD, IF_DEF_PWD;

	unsigned short   IF_DEF_ExpLink;

	unsigned short   IF_DEF_HiVision;

	unsigned short   LCDResInfo, LCDTypeInfo, VBType;/*301b*/