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

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

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



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 ebe33024

drivers/staging/xgifb/vb_setmode.c

+16 −29
Original line number Diff line number Diff line
@@ -4547,36 +4547,23 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex, 
						temp -= 6;

				}

			}

		} else {

			if (!(modeflag & HalfDCLK)) {

		} else if (!(modeflag & HalfDCLK)) {

			temp -= 4;

				if (pVBInfo->LCDResInfo != Panel1280x960) {

					if (pVBInfo->VGAHDE >= 800) {

			if (pVBInfo->LCDResInfo != Panel1280x960 &&

			    pVBInfo->VGAHDE >= 800) {

				temp -= 7;

						if (pVBInfo->ModeType ==

							ModeEGA) {

							if (pVBInfo->VGAVDE ==

							    1024) {

				if (pVBInfo->ModeType == ModeEGA &&

				    pVBInfo->VGAVDE == 1024) {

					temp += 15;

								if (pVBInfo->LCDResInfo != Panel1280x1024) {

									temp +=

									    7;

								}

							}

					if (pVBInfo->LCDResInfo !=

						Panel1280x1024)

						temp += 7;

				}



						if (pVBInfo->VGAHDE >= 1280) {

							if (pVBInfo->LCDResInfo

									!= Panel1280x960) {

								if (pVBInfo->LCDInfo

										& LCDNonExpanding) {

									temp

											+= 28;

								}

							}

						}

					}

				}

				if (pVBInfo->VGAHDE >= 1280 &&

				    pVBInfo->LCDResInfo != Panel1280x960 &&

				    (pVBInfo->LCDInfo & LCDNonExpanding))

					temp += 28;

			}

		}

	}