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

staging: xgifb: eliminate pVBInfo->AGPReg 



Access XGI340_AGPReg directly and make it const.

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

drivers/staging/xgifb/vb_def.h

+1 −0
Original line number Diff line number Diff line
@@ -264,5 +264,6 @@ extern const struct XGI_CRT1TableStruct XGI_CRT1Table[]; 
extern const struct XGI_ECLKDataStruct XGI340_ECLKData[];

extern const struct SiS_VCLKData XGI_VCLKData[];

extern const unsigned char XGI340_CR6B[][4];

extern const unsigned char XGI340_AGPReg[];



#endif

drivers/staging/xgifb/vb_init.c

+3 −3
Original line number Diff line number Diff line
@@ -1378,17 +1378,17 @@ unsigned char XGIInitNew(struct pci_dev *pdev) 
		for (i = 0x47; i <= 0x4C; i++)

			xgifb_reg_set(pVBInfo->P3d4,

				      i,

				      pVBInfo->AGPReg[i - 0x47]);

				      XGI340_AGPReg[i - 0x47]);



		for (i = 0x70; i <= 0x71; i++)

			xgifb_reg_set(pVBInfo->P3d4,

				      i,

				      pVBInfo->AGPReg[6 + i - 0x70]);

				      XGI340_AGPReg[6 + i - 0x70]);



		for (i = 0x74; i <= 0x77; i++)

			xgifb_reg_set(pVBInfo->P3d4,

				      i,

				      pVBInfo->AGPReg[8 + i - 0x74]);

				      XGI340_AGPReg[8 + i - 0x74]);



		pci_read_config_dword(pdev, 0x50, &Temp);

		Temp >>= 20;

drivers/staging/xgifb/vb_setmode.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) 


	pVBInfo->SR15 = XGI340_SR13;

	pVBInfo->CR40 = XGI340_cr41;

	pVBInfo->AGPReg = XGI340_AGPReg;



	/* 310 customization related */

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

drivers/staging/xgifb/vb_struct.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ struct vb_device_info { 
	unsigned char (*SR15)[8];

	unsigned char (*CR40)[8];



	unsigned char  *AGPReg;

	struct SiS_MCLKData  *MCLKData;



	unsigned char   *pXGINew_DRAMTypeDefinition;

drivers/staging/xgifb/vb_table.h

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ const unsigned char XGI340_CR6B[8][4] = { 
};



/* CR47,CR48,CR49,CR4A,CR4B,CR4C,CR70,CR71,CR74,CR75,CR76,CR77 */

static unsigned char XGI340_AGPReg[12] = {

const unsigned char XGI340_AGPReg[12] = {

	0x28, 0x23, 0x00, 0x20, 0x00, 0x20,

	0x00, 0x05, 0xd0, 0x10, 0x10, 0x00

};