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

Commit e44adfdb authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman
Browse files

staging/xgifb: Simplify XGISetModeNew 



This patch simplifies the code of XGISetModeNew by reordering the
if/else if/case conditions when both branches are doing exactly the
same.

Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06cc47b9

drivers/staging/xgifb/vb_setmode.c

+3 −15
Original line number Original line Diff line number Diff line
@@ -5907,7 +5907,8 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info, 
		XGI_GetLCDInfo(ModeNo, ModeIdIndex, pVBInfo);

		XGI_GetLCDInfo(ModeNo, ModeIdIndex, pVBInfo);

		XGI_DisableBridge(xgifb_info, HwDeviceExtension, pVBInfo);

		XGI_DisableBridge(xgifb_info, HwDeviceExtension, pVBInfo);





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

		if (pVBInfo->VBInfo & (SetSimuScanMode | XGI_SetCRT2ToLCDA) ||

			(!(pVBInfo->VBInfo & SwitchCRT2))) {

			XGI_SetCRT1Group(xgifb_info, HwDeviceExtension, ModeNo,

			XGI_SetCRT1Group(xgifb_info, HwDeviceExtension, ModeNo,

					ModeIdIndex, pVBInfo);

					ModeIdIndex, pVBInfo);
@@ -5915,24 +5916,11 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info, 
				XGI_SetLCDAGroup(ModeNo, ModeIdIndex,

				XGI_SetLCDAGroup(ModeNo, ModeIdIndex,

						HwDeviceExtension, pVBInfo);

						HwDeviceExtension, pVBInfo);

			}

			}

		} else if (!(pVBInfo->VBInfo & SwitchCRT2)) {

			XGI_SetCRT1Group(xgifb_info,

					HwDeviceExtension, ModeNo,

					ModeIdIndex, pVBInfo);

			if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {

				XGI_SetLCDAGroup(ModeNo, ModeIdIndex,

						HwDeviceExtension,

						pVBInfo);

			}

		}

		}





		if (pVBInfo->VBInfo & (SetSimuScanMode | SwitchCRT2)) {

		if (pVBInfo->VBInfo & (SetSimuScanMode | SwitchCRT2)) {

			switch (HwDeviceExtension->ujVBChipID) {

			switch (HwDeviceExtension->ujVBChipID) {

			case VB_CHIP_301:

			case VB_CHIP_301: /* fall through */

				XGI_SetCRT2Group301(ModeNo, HwDeviceExtension,

						pVBInfo); /*add for CRT2 */

				break;



			case VB_CHIP_302:

			case VB_CHIP_302:

				XGI_SetCRT2Group301(ModeNo, HwDeviceExtension,

				XGI_SetCRT2Group301(ModeNo, HwDeviceExtension,

						pVBInfo); /*add for CRT2 */

						pVBInfo); /*add for CRT2 */