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

staging: xgifb: eliminate pVBInfo->SR21/22/25 



In-line constants that are used only once.

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

drivers/staging/xgifb/vb_def.h

+0 −1
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ 
#define XGI330_SR1F 0

#define XGI330_SR23 0xf6

#define XGI330_SR24 0x0d

#define XGI330_SR25 0

#define XGI330_SR31 0xc0

#define XGI330_SR32 0x11

#define XGI330_SR33 0

drivers/staging/xgifb/vb_init.c

+3 −6
Original line number Diff line number Diff line
@@ -1401,7 +1401,7 @@ unsigned char XGIInitNew(struct pci_dev *pdev) 
	/* Set PCI */

	xgifb_reg_set(pVBInfo->P3c4, 0x23, XGI330_SR23);

	xgifb_reg_set(pVBInfo->P3c4, 0x24, XGI330_SR24);

	xgifb_reg_set(pVBInfo->P3c4, 0x25, XGI330_SR25);

	xgifb_reg_set(pVBInfo->P3c4, 0x25, 0);



	if (HwDeviceExtension->jChipType < XG20) {

		/* Set VB */
@@ -1482,11 +1482,8 @@ unsigned char XGIInitNew(struct pci_dev *pdev) 


	XGINew_SetDRAMSize_340(xgifb_info, HwDeviceExtension, pVBInfo);



	xgifb_reg_set(pVBInfo->P3c4,

		      0x22,

		      (unsigned char) ((pVBInfo->SR22) & 0xFE));



	xgifb_reg_set(pVBInfo->P3c4, 0x21, pVBInfo->SR21);

	xgifb_reg_set(pVBInfo->P3c4, 0x22, 0xfa);

	xgifb_reg_set(pVBInfo->P3c4, 0x21, 0xa3);



	XGINew_ChkSenseStatus(HwDeviceExtension, pVBInfo);

	XGINew_SetModeScratch(HwDeviceExtension, pVBInfo);

drivers/staging/xgifb/vb_setmode.c

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

	pVBInfo->SR16 = XGI340_SR16;



	pVBInfo->SR21 = 0xa3;

	pVBInfo->SR22 = 0xfb;



	/* 310 customization related */

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

		pVBInfo->LCDCapList = XGI_LCDDLCapList;

drivers/staging/xgifb/vb_struct.h

+0 −3
Original line number Diff line number Diff line
@@ -165,9 +165,6 @@ struct vb_device_info { 


	unsigned char  *AGPReg;

	unsigned char  *SR16;

	unsigned char  SR21;

	unsigned char  SR22;

	unsigned char  SR25;

	struct SiS_MCLKData  *MCLKData;



	unsigned char   *pXGINew_DRAMTypeDefinition;