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

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

staging: xgifb: call XGI_GetVBType from InitTo330Pointer 



Move XGI_GetVBType call inside InitTo330Pointer to avoid code duplication.

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

drivers/staging/xgifb/vb_init.c

+0 −4
Original line number Diff line number Diff line
@@ -1212,10 +1212,6 @@ unsigned char XGIInitNew(struct pci_dev *pdev) 


	outb(0x67, pVBInfo->P3c2);



	if (HwDeviceExtension->jChipType < XG20)

		/* Run XGI_GetVBType before InitTo330Pointer */

		XGI_GetVBType(pVBInfo);



	InitTo330Pointer(HwDeviceExtension->jChipType, pVBInfo);



	/* Openkey */

drivers/staging/xgifb/vb_setmode.c

+3 −3
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) 
	pVBInfo->SR18 = XGI340_SR18;

	pVBInfo->CR40 = XGI340_cr41;



	if (ChipType < XG20)

		XGI_GetVBType(pVBInfo);



	/* 310 customization related */

	if ((pVBInfo->VBType & VB_SIS301LV) || (pVBInfo->VBType & VB_SIS302LV))

		pVBInfo->LCDCapList = XGI_LCDDLCapList;
@@ -5734,9 +5737,6 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info, 
		}

	}



	if (HwDeviceExtension->jChipType < XG20)

		XGI_GetVBType(pVBInfo);



	InitTo330Pointer(HwDeviceExtension->jChipType, pVBInfo);

	if (ModeNo & 0x80)

		ModeNo = ModeNo & 0x7F;