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

staging: xgifb: XGI_GetVCLK2Ptr(): delete IF_DEF_LVDS check 



Delete IF_DEF_LVDS check, this function is never called when it's true.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1e927711

drivers/staging/xgifb/vb_setmode.c

+30 −41
Original line number Diff line number Diff line
@@ -865,9 +865,7 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, 
	/* si+Ext_ResInfo */

	modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;



	if (pVBInfo->IF_DEF_LVDS == 0) {

		if (pVBInfo->VBInfo &

		    (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) { /*301b*/

	if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) { /*301b*/

		if (pVBInfo->LCDResInfo != Panel_1024x768)

			/* LCDXlat2VCLK */

			VCLKIndex = VCLK108_2_315 + 5;
@@ -881,11 +879,9 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, 


		if (pVBInfo->SetFlag & TVSimuMode) {

			if (modeflag & Charx8Dot) {

					VCLKIndex = TVCLKBASE_315_25 +

							HiTVSimuVCLK;

				VCLKIndex = TVCLKBASE_315_25 + HiTVSimuVCLK;

			} else {

					VCLKIndex = TVCLKBASE_315_25 +

							HiTVTextVCLK;

				VCLKIndex = TVCLKBASE_315_25 + HiTVTextVCLK;

			}

		}
@@ -903,16 +899,9 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, 
			VCLKIndex = TVCLKBASE_315_25 + TVVCLK;

	} else { /* for CRT2 */

		/* di+Ext_CRTVCLK */

			VCLKIndex = XGI330_RefIndex[RefreshRateTableIndex].

								Ext_CRTVCLK;

		VCLKIndex = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;

		VCLKIndex &= IndexMask;

	}

	} else if ((pVBInfo->LCDResInfo == Panel_800x600) ||

		   (pVBInfo->LCDResInfo == Panel_320x480)) { /* LVDS */

		VCLKIndex = VCLK40; /* LVDSXlat1VCLK */

	} else {

		VCLKIndex = VCLK65_315 + 2; /* LVDSXlat2VCLK, LVDSXlat3VCLK */

	}



	return VCLKIndex;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE