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

staging: xgifb: eliminate pVBInfo->VCLKData/VBVCLKData 



Access XGI_VCLKData and XGI_VBVCLKData directly and make them const.

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

drivers/staging/xgifb/XGI_main_26.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr, 


	ClockIndex = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;



	Clock = XGI_Pr->VCLKData[ClockIndex].CLOCK * 1000;

	Clock = XGI_VCLKData[ClockIndex].CLOCK * 1000;



	return Clock;

}

drivers/staging/xgifb/vb_def.h

+1 −0
Original line number Diff line number Diff line
@@ -263,5 +263,6 @@ extern const struct XGI_ExtStruct XGI330_EModeIDTable[]; 
extern const struct XGI_Ext2Struct XGI330_RefIndex[];

extern const struct XGI_CRT1TableStruct XGI_CRT1Table[];

extern const struct XGI_ECLKDataStruct XGI340_ECLKData[];

extern const struct SiS_VCLKData XGI_VCLKData[];



#endif

drivers/staging/xgifb/vb_setmode.c

+11 −17
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ static const unsigned short XGINew_VGA_DAC[] = { 
void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)

{

	pVBInfo->MCLKData = XGI340New_MCLKData;

	pVBInfo->VCLKData = XGI_VCLKData;

	pVBInfo->VBVCLKData = XGI_VBVCLKData;

	pVBInfo->ScreenOffset = XGI330_ScreenOffset;

	pVBInfo->StResInfo = XGI330_StResInfo;

	pVBInfo->ModeResInfo = XGI330_ModeResInfo;
@@ -181,12 +179,12 @@ static unsigned char XGI_SetDefaultVCLK(struct vb_device_info *pVBInfo) 
{



	xgifb_reg_and_or(pVBInfo->P3c4, 0x31, ~0x30, 0x20);

	xgifb_reg_set(pVBInfo->P3c4, 0x2B, pVBInfo->VCLKData[0].SR2B);

	xgifb_reg_set(pVBInfo->P3c4, 0x2C, pVBInfo->VCLKData[0].SR2C);

	xgifb_reg_set(pVBInfo->P3c4, 0x2B, XGI_VCLKData[0].SR2B);

	xgifb_reg_set(pVBInfo->P3c4, 0x2C, XGI_VCLKData[0].SR2C);



	xgifb_reg_and_or(pVBInfo->P3c4, 0x31, ~0x30, 0x10);

	xgifb_reg_set(pVBInfo->P3c4, 0x2B, pVBInfo->VCLKData[1].SR2B);

	xgifb_reg_set(pVBInfo->P3c4, 0x2C, pVBInfo->VCLKData[1].SR2C);

	xgifb_reg_set(pVBInfo->P3c4, 0x2B, XGI_VCLKData[1].SR2B);

	xgifb_reg_set(pVBInfo->P3c4, 0x2C, XGI_VCLKData[1].SR2C);



	xgifb_reg_and(pVBInfo->P3c4, 0x31, ~0x30);

	return 0;
@@ -961,10 +959,8 @@ static void XGI_SetCRT1VCLK(unsigned short ModeNo, 
		index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;

		data = xgifb_reg_get(pVBInfo->P3c4, 0x31) & 0xCF;

		xgifb_reg_set(pVBInfo->P3c4, 0x31, data);

		xgifb_reg_set(pVBInfo->P3c4, 0x2B,

				pVBInfo->VCLKData[index].SR2B);

		xgifb_reg_set(pVBInfo->P3c4, 0x2C,

				pVBInfo->VCLKData[index].SR2C);

		xgifb_reg_set(pVBInfo->P3c4, 0x2B, XGI_VCLKData[index].SR2B);

		xgifb_reg_set(pVBInfo->P3c4, 0x2C, XGI_VCLKData[index].SR2C);

		xgifb_reg_set(pVBInfo->P3c4, 0x2D, 0x01);

	} else if ((pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV

			| VB_SIS302LV | VB_XGI301C)) && (pVBInfo->VBInfo
@@ -974,19 +970,17 @@ static void XGI_SetCRT1VCLK(unsigned short ModeNo, 
				pVBInfo);

		data = xgifb_reg_get(pVBInfo->P3c4, 0x31) & 0xCF;

		xgifb_reg_set(pVBInfo->P3c4, 0x31, data);

		data = pVBInfo->VBVCLKData[vclkindex].Part4_A;

		data = XGI_VBVCLKData[vclkindex].Part4_A;

		xgifb_reg_set(pVBInfo->P3c4, 0x2B, data);

		data = pVBInfo->VBVCLKData[vclkindex].Part4_B;

		data = XGI_VBVCLKData[vclkindex].Part4_B;

		xgifb_reg_set(pVBInfo->P3c4, 0x2C, data);

		xgifb_reg_set(pVBInfo->P3c4, 0x2D, 0x01);

	} else {

		index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;

		data = xgifb_reg_get(pVBInfo->P3c4, 0x31) & 0xCF;

		xgifb_reg_set(pVBInfo->P3c4, 0x31, data);

		xgifb_reg_set(pVBInfo->P3c4, 0x2B,

				pVBInfo->VCLKData[index].SR2B);

		xgifb_reg_set(pVBInfo->P3c4, 0x2C,

				pVBInfo->VCLKData[index].SR2C);

		xgifb_reg_set(pVBInfo->P3c4, 0x2B, XGI_VCLKData[index].SR2B);

		xgifb_reg_set(pVBInfo->P3c4, 0x2C, XGI_VCLKData[index].SR2C);

		xgifb_reg_set(pVBInfo->P3c4, 0x2D, 0x01);

	}
@@ -1053,7 +1047,7 @@ static void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension, 


	index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;

	index &= IndexMask;

	VCLK = pVBInfo->VCLKData[index].CLOCK;

	VCLK = XGI_VCLKData[index].CLOCK;



	data = xgifb_reg_get(pVBInfo->P3c4, 0x32);

	data &= 0xf3;

drivers/staging/xgifb/vb_struct.h

+0 −2
Original line number Diff line number Diff line
@@ -179,8 +179,6 @@ struct vb_device_info { 
	struct XGI_TimingHStruct TimingH;

	struct XGI_TimingVStruct TimingV;



	struct SiS_VCLKData    *VCLKData;

	struct SiS_VBVCLKData  *VBVCLKData;

	struct SiS_StResInfo_S   *StResInfo;

	struct SiS_ModeResInfo_S *ModeResInfo;

drivers/staging/xgifb/vb_table.h

+2 −2
Original line number Diff line number Diff line
@@ -2157,7 +2157,7 @@ static struct SiS_ModeResInfo_S XGI330_ModeResInfo[] = { 
	{1152,  864, 8, 16}

};



static struct SiS_VCLKData XGI_VCLKData[] = {

const struct SiS_VCLKData XGI_VCLKData[] = {

	/* SR2B,SR2C,SR2D */

	{0x1B, 0xE1,  25}, /* 00 (25.175MHz) */

	{0x4E, 0xE4,  28}, /* 01 (28.322MHz) */
@@ -2250,7 +2250,7 @@ static struct SiS_VCLKData XGI_VCLKData[] = { 
	{0xFF, 0x00,   0}  /* End mark */

};



static struct SiS_VBVCLKData XGI_VBVCLKData[] = {

static const struct SiS_VBVCLKData XGI_VBVCLKData[] = {

	{0x1B, 0xE1,  25}, /* 00 (25.175MHz) */

	{0x4E, 0xE4,  28}, /* 01 (28.322MHz) */

	{0x57, 0xE4,  31}, /* 02 (31.500MHz) */