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

staging: xgifb: eliminate pVBInfo->CR6E/6F/89 



Eliminate dummy zero read-only global data.

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

drivers/staging/xgifb/vb_init.c

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

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

		/* CR6E DQM fine tune delay */

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

		temp = 0;

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

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

			temp2 |= temp1;
@@ -463,7 +463,7 @@ static void XGINew_SetDRAMDefaultRegister340( 
		temp2 = 0;

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

			/* CR6F DQ fine tune delay */

			temp = pVBInfo->CR6F[pVBInfo->ram_type][8 * k + i];

			temp = 0;

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

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

				temp2 |= temp1;
@@ -486,7 +486,7 @@ static void XGINew_SetDRAMDefaultRegister340( 


	temp2 = 0x80;

	/* CR89 terminator type select */

	temp = pVBInfo->CR89[pVBInfo->ram_type][0];

	temp = 0;

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

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

		temp2 |= temp1;
@@ -496,7 +496,7 @@ static void XGINew_SetDRAMDefaultRegister340( 
		temp2 += 0x10;

	}



	temp = pVBInfo->CR89[pVBInfo->ram_type][1];

	temp = 0;

	temp1 = temp & 0x03;

	temp2 |= temp1;

	xgifb_reg_set(P3d4, 0x89, temp2);

drivers/staging/xgifb/vb_setmode.c

+0 −3
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) 
	pVBInfo->SR15 = XGI340_SR13;

	pVBInfo->CR40 = XGI340_cr41;

	pVBInfo->CR6B = XGI340_CR6B;

	pVBInfo->CR6E = XGI340_CR6E;

	pVBInfo->CR6F = XGI340_CR6F;

	pVBInfo->CR89 = XGI340_CR89;

	pVBInfo->AGPReg = XGI340_AGPReg;

	pVBInfo->SR16 = XGI340_SR16;

drivers/staging/xgifb/vb_struct.h

+0 −3
Original line number Diff line number Diff line
@@ -159,9 +159,6 @@ struct vb_device_info { 
	unsigned long BaseAddr;



	unsigned char (*CR6B)[4];

	unsigned char (*CR6E)[4];

	unsigned char (*CR6F)[32];

	unsigned char (*CR89)[2];



	unsigned char (*SR15)[8];

	unsigned char (*CR40)[8];

drivers/staging/xgifb/vb_table.h

+0 −6
Original line number Diff line number Diff line
@@ -114,12 +114,6 @@ static unsigned char XGI340_CR6B[8][4] = { 
	{0x00, 0x00, 0x00, 0x00}

};



static unsigned char XGI340_CR6E[8][4];



static unsigned char XGI340_CR6F[8][32];



static unsigned char XGI340_CR89[8][2];



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

static unsigned char XGI340_AGPReg[12] = {

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