diff options
| author | Aaro Koskinen | 2012-11-04 20:15:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-11-13 21:54:29 +0100 |
| commit | 38c09652a0620095b545d91c5806544e99f5effc (patch) | |
| tree | 474ff009b949046b8b8ffd54367079b4539deb44 /drivers/staging/xgifb | |
| parent | staging: xgifb: eliminate pVBInfo->StResInfo (diff) | |
| download | kernel-qcow2-linux-38c09652a0620095b545d91c5806544e99f5effc.tar.gz kernel-qcow2-linux-38c09652a0620095b545d91c5806544e99f5effc.tar.xz kernel-qcow2-linux-38c09652a0620095b545d91c5806544e99f5effc.zip | |
staging: xgifb: eliminate pVBInfo->SR21/22/25
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>
Diffstat (limited to 'drivers/staging/xgifb')
| -rw-r--r-- | drivers/staging/xgifb/vb_def.h | 1 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_init.c | 9 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 3 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_struct.h | 3 |
4 files changed, 3 insertions, 13 deletions
diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h index 46f9aa58bbaf..a519d3005a42 100644 --- a/drivers/staging/xgifb/vb_def.h +++ b/drivers/staging/xgifb/vb_def.h @@ -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 diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 1be740cda81a..8f6090b6ffd8 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -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); diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 2ffa35e1e9dc..70912dc10c46 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -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; diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 8353f1692542..201fcc5b58ff 100644 --- a/drivers/staging/xgifb/vb_struct.h +++ b/drivers/staging/xgifb/vb_struct.h @@ -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; |