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

Commit 798b4da5 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: vb_setmode: reduce if nesting in XGI_GetVCLK2Ptr() 



Eliminate unnecessary nesting levels by rearranging code and conditions.
The resulting code should be still identical.

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

drivers/staging/xgifb/vb_setmode.c

+44 −66
Original line number Diff line number Diff line
@@ -1274,9 +1274,7 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, 
				VCLKIndex = LCDXlat2VCLK[CRT2Index];

			else

				VCLKIndex = LCDXlat1VCLK[CRT2Index];

		} else { /* for TV */

			if (pVBInfo->VBInfo & SetCRT2ToTV) {

				if (pVBInfo->VBInfo & SetCRT2ToHiVisionTV) {

		} else if (pVBInfo->VBInfo & SetCRT2ToHiVisionTV) {

			if (pVBInfo->SetFlag & RPLLDIV2XO) {

				VCLKIndex = HiTVVCLKDIV2;

				VCLKIndex += 25;
@@ -1287,66 +1285,46 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, 


			if (pVBInfo->SetFlag & TVSimuMode) {

				if (modeflag & Charx8Dot) {

							VCLKIndex =

								HiTVSimuVCLK;

					VCLKIndex = HiTVSimuVCLK;

					VCLKIndex += 25;

				} else {

							VCLKIndex =

								HiTVTextVCLK;

					VCLKIndex = HiTVTextVCLK;

					VCLKIndex += 25;

				}

			}



			/* 301lv */

					if (pVBInfo->VBType & VB_XGI301LV) {

						if (!(pVBInfo->VBExtInfo ==

						     VB_YPbPr1080i)) {

							VCLKIndex =

								YPbPr750pVCLK;

							if (!(pVBInfo->VBExtInfo

									==

							     VB_YPbPr750p)) {

								VCLKIndex =

								  YPbPr525pVCLK;

								if (!(pVBInfo->VBExtInfo

										== VB_YPbPr525p)) {

									VCLKIndex

											= YPbPr525iVCLK_2;

									if (!(pVBInfo->SetFlag

											& RPLLDIV2XO))

										VCLKIndex

												= YPbPr525iVCLK;

								}

							}

						}

			if ((pVBInfo->VBType & VB_XGI301LV) &&

			    !(pVBInfo->VBExtInfo == VB_YPbPr1080i)) {

				if (pVBInfo->VBExtInfo == VB_YPbPr750p)

					VCLKIndex = YPbPr750pVCLK;

				else if (pVBInfo->VBExtInfo == VB_YPbPr525p)

					VCLKIndex = YPbPr525pVCLK;

				else if (pVBInfo->SetFlag & RPLLDIV2XO)

					VCLKIndex = YPbPr525iVCLK_2;

				else

					VCLKIndex = YPbPr525iVCLK;

			}

				} else {

					if (pVBInfo->VBInfo & SetCRT2ToTV) {

						if (pVBInfo->SetFlag &

						    RPLLDIV2XO) {

		} else if (pVBInfo->VBInfo & SetCRT2ToTV) {

			if (pVBInfo->SetFlag & RPLLDIV2XO) {

				VCLKIndex = TVVCLKDIV2;

				VCLKIndex += 25;

			} else {

				VCLKIndex = TVVCLK;

				VCLKIndex += 25;

			}

					}

				}

		} else { /* for CRT2 */

			/* Port 3cch */

				VCLKIndex = (unsigned char) inb(

						(pVBInfo->P3ca + 0x02));

			VCLKIndex = (unsigned char) inb((pVBInfo->P3ca + 0x02));

			VCLKIndex = ((VCLKIndex >> 2) & 0x03);

			if (ModeNo > 0x13) {

				/* di+Ext_CRTVCLK */

					VCLKIndex =

						pVBInfo->RefIndex[

				VCLKIndex = pVBInfo->RefIndex[

							RefreshRateTableIndex].

								Ext_CRTVCLK;

				VCLKIndex &= IndexMask;

			}

		}

		}

	} else { /* LVDS */

		if (ModeNo <= 0x13)

			VCLKIndex = CRT2Index;