staging: xgifb: eliminate pVBInfo->ScreenOffset

Access XGI330_ScreenOffset directly and make it const.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 137725cbfd220313c8a6a8a18d2ed21d469d54ed..137c3df9d69d2868f45afed47a68e56ad772ed11 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -24,7 +24,6 @@ static const unsigned short XGINew_VGA_DAC[] = {
 void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
 {
        pVBInfo->MCLKData = XGI340New_MCLKData;
-       pVBInfo->ScreenOffset = XGI330_ScreenOffset;
        pVBInfo->StResInfo = XGI330_StResInfo;
        pVBInfo->ModeResInfo = XGI330_ModeResInfo;
 
@@ -806,7 +805,7 @@ static void XGI_SetCRT1Offset(unsigned short ModeNo,
        /* GetOffset */
        temp = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeInfo;
        temp = temp >> 8;
-       temp = pVBInfo->ScreenOffset[temp];
+       temp = XGI330_ScreenOffset[temp];
 
        temp2 = XGI330_RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
        temp2 &= InterlaceMode;
@@ -2977,7 +2976,7 @@ static unsigned short XGI_GetOffset(unsigned short ModeNo,
 
        index = (modeinfo >> 8) & 0xFF;
 
-       temp = pVBInfo->ScreenOffset[index];
+       temp = XGI330_ScreenOffset[index];
 
        if (infoflag & InterlaceMode)
                temp = temp << 1;

diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index 9d1a0c724ce300e82992a86b48f16f98de3fbb7d..d0ca193ccf1acfbc8d5404ac59834c4ea9af2fd5 100644 (file)
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -170,7 +170,6 @@ struct vb_device_info {
        unsigned char  SR25;
        struct SiS_MCLKData  *MCLKData;
 
-       unsigned char   *ScreenOffset;
        unsigned char   *pXGINew_DRAMTypeDefinition;
        unsigned char   XGINew_CR97;
 

diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
index ea133adb0ebf3acbce498ee81b2e545774a5ef64..453c528610430a428e7e83a23a8695bab35d96e1 100644 (file)
--- a/drivers/staging/xgifb/vb_table.h
+++ b/drivers/staging/xgifb/vb_table.h
@@ -2117,7 +2117,7 @@ const struct XGI_Ext2Struct XGI330_RefIndex[] = {
        0x30, 0x47, 0x37, 1024, 768},/* 48 1024x768x160Hz */
 };
 
-static unsigned char XGI330_ScreenOffset[] = {
+static const unsigned char XGI330_ScreenOffset[] = {
        0x14, 0x19, 0x20, 0x28, 0x32, 0x40,
        0x50, 0x64, 0x78, 0x80, 0x2d, 0x35,
        0x57, 0x48