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

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

staging: xgifb: XGI_GetTVInfo(): delete IF_DEF_LVDS checks 



This function is never called when pVBInfo->IF_DEF_LVDS is true, so we
can remove checks and reduce complexity.

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

drivers/staging/xgifb/vb_setmode.c

+19 −28
Original line number Diff line number Diff line
@@ -2137,10 +2137,8 @@ static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 
				   TVSetNTSCJ |

				   TVSetPAL);



		if (pVBInfo->IF_DEF_LVDS == 0) {

		if (pVBInfo->VBInfo & SetCRT2ToSCART)

			tempbx |= TVSetPAL;

		}



		if (pVBInfo->IF_DEF_YPbPr == 1) {

			if (pVBInfo->VBInfo & SetCRT2ToYPbPr525750) {
@@ -2162,14 +2160,12 @@ static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 
				tempbx = tempbx | TVSetHiVision | TVSetPAL;

		}



		if (pVBInfo->IF_DEF_LVDS == 0) { /* shampoo */

		if ((pVBInfo->VBInfo & SetInSlaveMode) &&

		    (!(pVBInfo->VBInfo & SetNotSimuMode)))

			tempbx |= TVSimuMode;



			if (!(tempbx & TVSetPAL) &&

			    (modeflag > 13) &&

			    (resinfo == 8)) /* NTSC 1024x768, */

		if (!(tempbx & TVSetPAL) && (modeflag > 13) && (resinfo == 8))

			/* NTSC 1024x768, */

			tempbx |= NTSC1024x768;



		tempbx |= RPLLDIV2XO;
@@ -2177,20 +2173,15 @@ static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 
		if (pVBInfo->VBInfo & SetCRT2ToHiVision) {

			if (pVBInfo->VBInfo & SetInSlaveMode)

				tempbx &= (~RPLLDIV2XO);

			} else if (tempbx &

				    (TVSetYPbPr525p | TVSetYPbPr750p)) {

		} else if (tempbx & (TVSetYPbPr525p | TVSetYPbPr750p)) {

			tempbx &= (~RPLLDIV2XO);

			} else if (!(pVBInfo->VBType &

					 (VB_SIS301B |

					  VB_SIS302B |

					  VB_SIS301LV |

					  VB_SIS302LV |

		} else if (!(pVBInfo->VBType & (VB_SIS301B | VB_SIS302B |

						VB_SIS301LV | VB_SIS302LV |

						VB_XGI301C))) {

			if (tempbx & TVSimuMode)

				tempbx &= (~RPLLDIV2XO);

		}

	}

	}

	pVBInfo->TVInfo = tempbx;

}