staging: xgifb: eliminate pVBInfo->CR6B

Access XGI340_CR6B 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_def.h b/drivers/staging/xgifb/vb_def.h
index a519d3005a429aea4daa7106e938dd5f36d234ca..ee13b848dce26ea4e76d5c2220fcbc8edea06adb 100644 (file)
--- a/drivers/staging/xgifb/vb_def.h
+++ b/drivers/staging/xgifb/vb_def.h
@@ -263,5 +263,6 @@ extern const struct XGI_Ext2Struct XGI330_RefIndex[];
 extern const struct XGI_CRT1TableStruct XGI_CRT1Table[];
 extern const struct XGI_ECLKDataStruct XGI340_ECLKData[];
 extern const struct SiS_VCLKData XGI_VCLKData[];
+extern const unsigned char XGI340_CR6B[][4];
 
 #endif

diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 8f6090b6ffd8b3663d659ed7f9e2136de41476df..ce419d4c950adf8f92e9c35b3d2a1246bc2a1c6b 100644 (file)
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -429,7 +429,7 @@ static void XGINew_SetDRAMDefaultRegister340(
        temp2 = 0;
        for (i = 0; i < 4; i++) {
                /* CR6B DQS fine tune delay */
-               temp = pVBInfo->CR6B[pVBInfo->ram_type][i];
+               temp = XGI340_CR6B[pVBInfo->ram_type][i];
                for (j = 0; j < 4; j++) {
                        temp1 = ((temp >> (2 * j)) & 0x03) << 2;
                        temp2 |= temp1;

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 70912dc10c46d361fbf1679ceb5c94dc8dd8629b..e863ec9f4e08ea00047ca285f684220f67506cbf 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -33,7 +33,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
 
        pVBInfo->SR15 = XGI340_SR13;
        pVBInfo->CR40 = XGI340_cr41;
-       pVBInfo->CR6B = XGI340_CR6B;
        pVBInfo->AGPReg = XGI340_AGPReg;
        pVBInfo->SR16 = XGI340_SR16;
 

diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index 201fcc5b58ff157218f5062e0d0616ad3fb285fc..2edd0896cf01a4fc0282bf0f3ba323e33c4f48e1 100644 (file)
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -158,8 +158,6 @@ struct vb_device_info {
        void __iomem *FBAddr;
        unsigned long BaseAddr;
 
-       unsigned char (*CR6B)[4];
-
        unsigned char (*SR15)[8];
        unsigned char (*CR40)[8];
 

diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
index 381d07f7671e8434374bbc882b167f426466b6fb..18200eb5fba43b84b456af856c5621b21d940da0 100644 (file)
--- a/drivers/staging/xgifb/vb_table.h
+++ b/drivers/staging/xgifb/vb_table.h
@@ -103,7 +103,7 @@ static unsigned char XGI27_cr41[24][8] = {
        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}  /* 23 CRC5 */
 };
 
-static unsigned char XGI340_CR6B[8][4] = {
+const unsigned char XGI340_CR6B[8][4] = {
        {0xaa, 0xaa, 0xaa, 0xaa},
        {0xaa, 0xaa, 0xaa, 0xaa},
        {0xaa, 0xaa, 0xaa, 0xaa},