Commit 6008f877 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: refactor XGI_GetLVDSData() 



Refactor XGI_GetLVDSData() to avoid nesting and redundant ifs.

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

drivers/staging/xgifb/vb_setmode.c

+27 −29
Original line number Diff line number Diff line
@@ -1380,27 +1380,27 @@ static void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex, 
		unsigned short RefreshRateTableIndex,

		struct vb_device_info *pVBInfo)

{

	struct SiS_LVDSData const *LCDPtr = NULL;

	struct SiS_LVDSData const *LCDPtr;



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

		return;



	if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {

	LCDPtr = XGI_GetLcdPtr(XGI_EPLLCDDataPtr, ModeNo, ModeIdIndex,

			       RefreshRateTableIndex, pVBInfo);

	pVBInfo->VGAHT	= LCDPtr->VGAHT;

	pVBInfo->VGAVT	= LCDPtr->VGAVT;

	pVBInfo->HT	= LCDPtr->LCDHT;

	pVBInfo->VT	= LCDPtr->LCDVT;

	}



	if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {

		if (!(pVBInfo->LCDInfo & (SetLCDtoNonExpanding

				| EnableScalingLCD))) {

	if (pVBInfo->LCDInfo & (SetLCDtoNonExpanding | EnableScalingLCD))

		return;



	if ((pVBInfo->LCDResInfo == Panel_1024x768) ||

	    (pVBInfo->LCDResInfo == Panel_1024x768x75)) {

		pVBInfo->HDE = 1024;

		pVBInfo->VDE = 768;

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

				   (pVBInfo->LCDResInfo ==

					Panel_1280x1024x75)) {

		   (pVBInfo->LCDResInfo == Panel_1280x1024x75)) {

		pVBInfo->HDE = 1280;

		pVBInfo->VDE = 1024;

	} else if (pVBInfo->LCDResInfo == Panel_1400x1050) {
@@ -1411,8 +1411,6 @@ static void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex, 
		pVBInfo->VDE = 1200;

	}

}

	}

}



static void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex,

		unsigned short RefreshRateTableIndex,