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

Commit 7eec23a7 authored by Miguel Gómez's avatar Miguel Gómez Committed by Greg Kroah-Hartman
Browse files

Staging: xgifb: Refactor XGI_GetVBType(). 



Refactor XGI_GetVBType() to reduce indentation and fix style warnings.

Signed-off-by: default avatarMiguel Gómez <magomez@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b175621

drivers/staging/xgifb/vb_setmode.c

+36 −33
Original line number Diff line number Diff line
@@ -2559,43 +2559,46 @@ void XGI_GetVBType(struct vb_device_info *pVBInfo) 
{

	unsigned short flag, tempbx, tempah;



	if (pVBInfo->IF_DEF_LVDS == 0) {

	if (pVBInfo->IF_DEF_LVDS != 0)

		return;



	tempbx = VB_SIS302B;

	flag = xgifb_reg_get(pVBInfo->Part4Port, 0x00);

		if (flag != 0x02) {

	if (flag == 0x02)

		goto finish;



	tempbx = VB_SIS301;

	flag = xgifb_reg_get(pVBInfo->Part4Port, 0x01);

			if (flag >= 0xB0) {

	if (flag < 0xB0)

		goto finish;



	tempbx = VB_SIS301B;

				if (flag >= 0xC0) {

	if (flag < 0xC0)

		goto bigger_than_0xB0;



	tempbx = VB_XGI301C;

					if (flag >= 0xD0) {

	if (flag < 0xD0)

		goto bigger_than_0xB0;



	tempbx = VB_SIS301LV;

						if (flag >= 0xE0) {

	if (flag < 0xE0)

		goto bigger_than_0xB0;



	tempbx = VB_SIS302LV;

							tempah = xgifb_reg_get(

							    pVBInfo->Part4Port,

							    0x39);

	tempah = xgifb_reg_get(pVBInfo->Part4Port, 0x39);

	if (tempah != 0xFF)

								tempbx =

								    VB_XGI301C;

						}

					}

				}

		tempbx = VB_XGI301C;



bigger_than_0xB0:

	if (tempbx & (VB_SIS301B | VB_SIS302B)) {

					flag = xgifb_reg_get(

							pVBInfo->Part4Port,

							0x23);



		flag = xgifb_reg_get(pVBInfo->Part4Port, 0x23);

		if (!(flag & 0x02))

			tempbx = tempbx | VB_NoLCD;

	}

			}

		}



finish:

	pVBInfo->VBType = tempbx;

}

}



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

		struct xgi_hw_device_info *HwDeviceExtension,