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

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

staging: xgifb: vb_setmode: eliminate GetVGAType/Set_VGAType 



Eliminate unneeded function and struct field. The same information is
available in HwDeviceExtension->jChipType.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fac2cc92

drivers/staging/xgifb/vb_setmode.c

+2 −17
Original line number Original line Diff line number Diff line
@@ -3132,19 +3132,6 @@ static void XGI_UpdateModeInfo(struct xgi_hw_device_info *HwDeviceExtension, 
	}

	}

}

}





static void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension,

		struct vb_device_info *pVBInfo)

{

	/*

	if ( HwDeviceExtension->jChipType >= XG20 ) {

		pVBInfo->Set_VGAType = XG20;

	} else {

		pVBInfo->Set_VGAType = VGA_XGI340;

	}

	*/

	pVBInfo->Set_VGAType = HwDeviceExtension->jChipType;

}



void XGI_GetVBType(struct vb_device_info *pVBInfo)

void XGI_GetVBType(struct vb_device_info *pVBInfo)

{

{

	unsigned short flag, tempbx, tempah;

	unsigned short flag, tempbx, tempah;
@@ -3220,8 +3207,8 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 




		if (pVBInfo->IF_DEF_LCDA == 1) {

		if (pVBInfo->IF_DEF_LCDA == 1) {





			if ((pVBInfo->Set_VGAType >= XG20)

			if ((HwDeviceExtension->jChipType >= XG20) ||

					|| (pVBInfo->Set_VGAType >= XG40)) {

			    (HwDeviceExtension->jChipType >= XG40)) {

				if (pVBInfo->IF_DEF_LVDS == 0) {

				if (pVBInfo->IF_DEF_LVDS == 0) {

					/* if ((pVBInfo->VBType & VB_XGI302B)

					/* if ((pVBInfo->VBType & VB_XGI302B)

					    || (pVBInfo->VBType & VB_XGI301LV)

					    || (pVBInfo->VBType & VB_XGI301LV)
@@ -7845,8 +7832,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, 




	XGI_SearchModeID(ModeNo, &ModeIdIndex, pVBInfo);

	XGI_SearchModeID(ModeNo, &ModeIdIndex, pVBInfo);





	XGI_GetVGAType(HwDeviceExtension, pVBInfo);



	if (HwDeviceExtension->jChipType < XG20) { /* kuku 2004/06/25 */

	if (HwDeviceExtension->jChipType < XG20) { /* kuku 2004/06/25 */

		XGI_GetVBInfo(ModeNo, ModeIdIndex, HwDeviceExtension, pVBInfo);

		XGI_GetVBInfo(ModeNo, ModeIdIndex, HwDeviceExtension, pVBInfo);

		XGI_GetTVInfo(ModeNo, ModeIdIndex, pVBInfo);

		XGI_GetTVInfo(ModeNo, ModeIdIndex, pVBInfo);

drivers/staging/xgifb/vb_struct.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -293,7 +293,7 @@ struct vb_device_info { 
	unsigned short   IF_DEF_ExpLink;

	unsigned short   IF_DEF_ExpLink;

	unsigned short   IF_DEF_HiVision;

	unsigned short   IF_DEF_HiVision;

	unsigned short   LCDResInfo, LCDTypeInfo, VBType;/*301b*/

	unsigned short   LCDResInfo, LCDTypeInfo, VBType;/*301b*/

	unsigned short   VBInfo, TVInfo, LCDInfo, Set_VGAType;

	unsigned short   VBInfo, TVInfo, LCDInfo;

	unsigned short   VBExtInfo;/*301lv*/

	unsigned short   VBExtInfo;/*301lv*/

	unsigned short   SetFlag;

	unsigned short   SetFlag;

	unsigned short   NewFlickerMode;

	unsigned short   NewFlickerMode;