diff options
| author | Aaro Koskinen | 2012-11-04 20:14:55 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-11-13 21:54:20 +0100 |
| commit | 7c5c07a611069a97aafc316d701da7bd08de14ee (patch) | |
| tree | 156e78cc84dc34b0164ccc46e04455e83cc0ba22 /drivers/staging/xgifb | |
| parent | staging: xgifb: eliminate pVBInfo->XGINEWUB_CRT1Table (diff) | |
| download | kernel-qcow2-linux-7c5c07a611069a97aafc316d701da7bd08de14ee.tar.gz kernel-qcow2-linux-7c5c07a611069a97aafc316d701da7bd08de14ee.tar.xz kernel-qcow2-linux-7c5c07a611069a97aafc316d701da7bd08de14ee.zip | |
staging: xgifb: eliminate pVBInfo->UpdateCRT1
Access XGI_UpdateCRT1Table directly and make it const.
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_setmode.c | 10 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_struct.h | 1 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_table.h | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 7ee42ac8e3ab..59423addd2c6 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -49,8 +49,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) pVBInfo->SR21 = 0xa3; pVBInfo->SR22 = 0xfb; - pVBInfo->UpdateCRT1 = XGI_UpdateCRT1Table; - /* 310 customization related */ if ((pVBInfo->VBType & VB_SIS301LV) || (pVBInfo->VBType & VB_SIS302LV)) pVBInfo->LCDCapList = XGI_LCDDLCapList; @@ -729,13 +727,13 @@ static void XGI_UpdateXG21CRTC(unsigned short ModeNo, if (index != -1) { xgifb_reg_set(pVBInfo->P3d4, 0x02, - pVBInfo->UpdateCRT1[index].CR02); + XGI_UpdateCRT1Table[index].CR02); xgifb_reg_set(pVBInfo->P3d4, 0x03, - pVBInfo->UpdateCRT1[index].CR03); + XGI_UpdateCRT1Table[index].CR03); xgifb_reg_set(pVBInfo->P3d4, 0x15, - pVBInfo->UpdateCRT1[index].CR15); + XGI_UpdateCRT1Table[index].CR15); xgifb_reg_set(pVBInfo->P3d4, 0x16, - pVBInfo->UpdateCRT1[index].CR16); + XGI_UpdateCRT1Table[index].CR16); } } diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 8bfbfab04643..e73ccd57e240 100644 --- a/drivers/staging/xgifb/vb_struct.h +++ b/drivers/staging/xgifb/vb_struct.h @@ -187,7 +187,6 @@ struct vb_device_info { struct SiS_VBVCLKData *VBVCLKData; struct SiS_StResInfo_S *StResInfo; struct SiS_ModeResInfo_S *ModeResInfo; - struct XGI_XG21CRT1Struct *UpdateCRT1; int ram_type; int ram_channel; diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h index e83c4259ce28..c08c04eaad0e 100644 --- a/drivers/staging/xgifb/vb_table.h +++ b/drivers/staging/xgifb/vb_table.h @@ -216,7 +216,7 @@ static const struct SiS_StandTable_S XGI330_StandTable = { 0xff} }; -static struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = { +static const struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = { {0x01, 0x27, 0x91, 0x8f, 0xc0}, /* 00 */ {0x03, 0x4f, 0x83, 0x8f, 0xc0}, /* 01 */ {0x05, 0x27, 0x91, 0x8f, 0xc0}, /* 02 */ |