Commit 7c5c07a6 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

staging: xgifb: eliminate pVBInfo->UpdateCRT1

Access XGI_UpdateCRT1Table directly and make it const.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7853bced
...@@ -49,8 +49,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) ...@@ -49,8 +49,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
pVBInfo->SR21 = 0xa3; pVBInfo->SR21 = 0xa3;
pVBInfo->SR22 = 0xfb; pVBInfo->SR22 = 0xfb;
pVBInfo->UpdateCRT1 = XGI_UpdateCRT1Table;
/* 310 customization related */ /* 310 customization related */
if ((pVBInfo->VBType & VB_SIS301LV) || (pVBInfo->VBType & VB_SIS302LV)) if ((pVBInfo->VBType & VB_SIS301LV) || (pVBInfo->VBType & VB_SIS302LV))
pVBInfo->LCDCapList = XGI_LCDDLCapList; pVBInfo->LCDCapList = XGI_LCDDLCapList;
...@@ -729,13 +727,13 @@ static void XGI_UpdateXG21CRTC(unsigned short ModeNo, ...@@ -729,13 +727,13 @@ static void XGI_UpdateXG21CRTC(unsigned short ModeNo,
if (index != -1) { if (index != -1) {
xgifb_reg_set(pVBInfo->P3d4, 0x02, xgifb_reg_set(pVBInfo->P3d4, 0x02,
pVBInfo->UpdateCRT1[index].CR02); XGI_UpdateCRT1Table[index].CR02);
xgifb_reg_set(pVBInfo->P3d4, 0x03, xgifb_reg_set(pVBInfo->P3d4, 0x03,
pVBInfo->UpdateCRT1[index].CR03); XGI_UpdateCRT1Table[index].CR03);
xgifb_reg_set(pVBInfo->P3d4, 0x15, xgifb_reg_set(pVBInfo->P3d4, 0x15,
pVBInfo->UpdateCRT1[index].CR15); XGI_UpdateCRT1Table[index].CR15);
xgifb_reg_set(pVBInfo->P3d4, 0x16, xgifb_reg_set(pVBInfo->P3d4, 0x16,
pVBInfo->UpdateCRT1[index].CR16); XGI_UpdateCRT1Table[index].CR16);
} }
} }
......
...@@ -187,7 +187,6 @@ struct vb_device_info { ...@@ -187,7 +187,6 @@ struct vb_device_info {
struct SiS_VBVCLKData *VBVCLKData; struct SiS_VBVCLKData *VBVCLKData;
struct SiS_StResInfo_S *StResInfo; struct SiS_StResInfo_S *StResInfo;
struct SiS_ModeResInfo_S *ModeResInfo; struct SiS_ModeResInfo_S *ModeResInfo;
struct XGI_XG21CRT1Struct *UpdateCRT1;
int ram_type; int ram_type;
int ram_channel; int ram_channel;
......
...@@ -216,7 +216,7 @@ static const struct SiS_StandTable_S XGI330_StandTable = { ...@@ -216,7 +216,7 @@ static const struct SiS_StandTable_S XGI330_StandTable = {
0xff} 0xff}
}; };
static struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = { static const struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = {
{0x01, 0x27, 0x91, 0x8f, 0xc0}, /* 00 */ {0x01, 0x27, 0x91, 0x8f, 0xc0}, /* 00 */
{0x03, 0x4f, 0x83, 0x8f, 0xc0}, /* 01 */ {0x03, 0x4f, 0x83, 0x8f, 0xc0}, /* 01 */
{0x05, 0x27, 0x91, 0x8f, 0xc0}, /* 02 */ {0x05, 0x27, 0x91, 0x8f, 0xc0}, /* 02 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment