redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
In-line constants that are used only once.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2012-11-04 21:15:02 +02:00 committed by Greg Kroah-Hartman
parent c705ea8165
commit 38c09652a0
4 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/xgifb/vb_def.h
View file

@ -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

9
drivers/staging/xgifb/vb_init.c
View file

@ -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);

3
drivers/staging/xgifb/vb_setmode.c
View file

@ -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;

3
drivers/staging/xgifb/vb_struct.h
View file

@ -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;