staging/xgifb: Replace XGI340_CR6B table with simple if/else

The XGI340_CR6B lookup table consists of the entries
{0xaa, 0xaa, 0xaa, 0xaa} for an index <= 2 and
{0x00, 0x00, 0x00, 0x00} for all other indices.

The only user XGINew_SetDRAMDefaultRegister340 loops over these 4 values
of a line with a for loop and since all entries are the same for each line
we can simply replace the whole lookup table with a simple if/else assignment.

Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index dd34570347aa76007070fdd9396ef24a40de1eac..a778df6f7cc6f1aca92dc68228c2afde6f820918 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 = XGI340_CR6B[pVBInfo->ram_type][i];
+               temp = (pVBInfo->ram_type <= 2) ? 0xaa : 0x00;
                for (j = 0; j < 4; j++) {
                        temp1 = ((temp >> (2 * j)) & 0x03) << 2;
                        temp2 |= temp1;

diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
index fca1a1d6340864093b456c15041e879352e1e6ca..34e16569de3b058f4fc338ef561ec01b5656d66e 100644 (file)
--- a/drivers/staging/xgifb/vb_table.h
+++ b/drivers/staging/xgifb/vb_table.h
@@ -103,17 +103,6 @@ static const unsigned char XGI27_cr41[24][8] = {
        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}  /* 23 CRC5 */
 };
 
-const unsigned char XGI340_CR6B[8][4] = {
-       {0xaa, 0xaa, 0xaa, 0xaa},
-       {0xaa, 0xaa, 0xaa, 0xaa},
-       {0xaa, 0xaa, 0xaa, 0xaa},
-       {0x00, 0x00, 0x00, 0x00},
-       {0x00, 0x00, 0x00, 0x00},
-       {0x00, 0x00, 0x00, 0x00},
-       {0x00, 0x00, 0x00, 0x00},
-       {0x00, 0x00, 0x00, 0x00}
-};
-
 /* CR47,CR48,CR49,CR4A,CR4B,CR4C,CR70,CR71,CR74,CR75,CR76,CR77 */
 const unsigned char XGI340_AGPReg[12] = {
        0x28, 0x23, 0x00, 0x20, 0x00, 0x20,