staging: xgifb: XGINew_SetDRAMDefaultRegister340: inline the value of SR1B

SR1B register value is always 3 regardless of video card or RAM type.

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_init.c b/drivers/staging/xgifb/vb_init.c
index 46baacbf56b96fb42286e7e7c07178629f9cf6ff..18095fbe6d98bb02d1e41d26714956286bbb2fc7 100644 (file)
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -507,9 +507,7 @@ static void XGINew_SetDRAMDefaultRegister340(
                xgifb_reg_set(P3d4, 0xB0, 0x80); /* DDRII Dual frequency mode */
                XGINew_DDR2_DefaultRegister(HwDeviceExtension, P3d4, pVBInfo);
        }
-       xgifb_reg_set(P3c4,
-                     0x1B,
-                     pVBInfo->SR15[3][pVBInfo->ram_type]); /* SR1B */
+       xgifb_reg_set(P3c4, 0x1B, 0x03); /* SR1B */
 }
 
 

diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
index ee4dcf1337a912c41fe03cf91a9e570f65b5fb7a..38ae554558308707179a77f8377338203ca1d8cf 100644 (file)
--- a/drivers/staging/xgifb/vb_table.h
+++ b/drivers/staging/xgifb/vb_table.h
@@ -18,18 +18,16 @@ const struct XGI_ECLKDataStruct XGI340_ECLKData[] = {
        {0x7C, 0x08, 0x01, 200},
 };
 
-static const unsigned char XG27_SR13[4][3] = {
+static const unsigned char XG27_SR13[3][3] = {
        {0x35, 0x45, 0xb1}, /* SR13 */
        {0x41, 0x51, 0x5c}, /* SR14 */
        {0x32, 0x32, 0x42}, /* SR18 */
-       {0x03, 0x03, 0x03}  /* SR1B */
 };
 
-static const unsigned char XGI340_SR13[4][3] = {
+static const unsigned char XGI340_SR13[3][3] = {
        {0x35, 0x45, 0xb1}, /* SR13 */
        {0x41, 0x51, 0x5c}, /* SR14 */
        {0x31, 0x42, 0x42}, /* SR18 */
-       {0x03, 0x03, 0x03}  /* SR1B */
 };
 
 static const unsigned char XGI340_cr41[24][3] = {