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

staging: xgifb: eliminate pVBInfo->CR6B 



Access XGI340_CR6B 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 38c09652

drivers/staging/xgifb/vb_def.h

+1 −0
Original line number Diff line number Diff line
@@ -263,5 +263,6 @@ 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[];

extern const unsigned char XGI340_CR6B[][4];



#endif

drivers/staging/xgifb/vb_init.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static void XGINew_SetDRAMDefaultRegister340( 
	temp2 = 0;

	for (i = 0; i < 4; i++) {

		/* CR6B DQS fine tune delay */

		temp = pVBInfo->CR6B[pVBInfo->ram_type][i];

		temp = XGI340_CR6B[pVBInfo->ram_type][i];

		for (j = 0; j < 4; j++) {

			temp1 = ((temp >> (2 * j)) & 0x03) << 2;

			temp2 |= temp1;

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->CR6B = XGI340_CR6B;

	pVBInfo->AGPReg = XGI340_AGPReg;

	pVBInfo->SR16 = XGI340_SR16;

drivers/staging/xgifb/vb_struct.h

+0 −2
Original line number Diff line number Diff line
@@ -158,8 +158,6 @@ struct vb_device_info { 
	void __iomem *FBAddr;

	unsigned long BaseAddr;



	unsigned char (*CR6B)[4];



	unsigned char (*SR15)[8];

	unsigned char (*CR40)[8];

drivers/staging/xgifb/vb_table.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static unsigned char XGI27_cr41[24][8] = { 
	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}  /* 23 CRC5 */

};



static unsigned char XGI340_CR6B[8][4] = {

const unsigned char XGI340_CR6B[8][4] = {

	{0xaa, 0xaa, 0xaa, 0xaa},

	{0xaa, 0xaa, 0xaa, 0xaa},

	{0xaa, 0xaa, 0xaa, 0xaa},