staging: xgifb: eliminate pVBInfo->SR16
authorAaro Koskinen <aaro.koskinen@iki.fi>
Sun, 4 Nov 2012 19:15:04 +0000 (21:15 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Nov 2012 20:54:30 +0000 (12:54 -0800)
Inline constant values that are used only once.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/xgifb/vb_init.c
drivers/staging/xgifb/vb_setmode.c
drivers/staging/xgifb/vb_struct.h
drivers/staging/xgifb/vb_table.h

index ce419d4c950adf8f92e9c35b3d2a1246bc2a1c6b..213ec1366a9edc7954bf21e52c232ebc49baf712 100644 (file)
@@ -94,8 +94,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4,
                      0x18,
                      pVBInfo->SR15[2][pVBInfo->ram_type]); /* SR18 */
        xgifb_reg_set(P3c4, 0x19, 0x01);
-       xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[0]);
-       xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[1]);
+       xgifb_reg_set(P3c4, 0x16, 0x03);
+       xgifb_reg_set(P3c4, 0x16, 0x83);
        mdelay(1);
        xgifb_reg_set(P3c4, 0x1B, 0x03);
        udelay(500);
@@ -103,8 +103,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4,
                      0x18,
                      pVBInfo->SR15[2][pVBInfo->ram_type]); /* SR18 */
        xgifb_reg_set(P3c4, 0x19, 0x00);
-       xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[2]);
-       xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[3]);
+       xgifb_reg_set(P3c4, 0x16, 0x03);
+       xgifb_reg_set(P3c4, 0x16, 0x83);
        xgifb_reg_set(P3c4, 0x1B, 0x00);
 }
 
index e863ec9f4e08ea00047ca285f684220f67506cbf..4d50940899ce9e06915d174a316af4933c5f87ae 100644 (file)
@@ -34,7 +34,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
        pVBInfo->SR15 = XGI340_SR13;
        pVBInfo->CR40 = XGI340_cr41;
        pVBInfo->AGPReg = XGI340_AGPReg;
-       pVBInfo->SR16 = XGI340_SR16;
 
        /* 310 customization related */
        if ((pVBInfo->VBType & VB_SIS301LV) || (pVBInfo->VBType & VB_SIS302LV))
index 2edd0896cf01a4fc0282bf0f3ba323e33c4f48e1..407b4a7c1009a4d16031c5d194b39480f75493ba 100644 (file)
@@ -162,7 +162,6 @@ struct vb_device_info {
        unsigned char (*CR40)[8];
 
        unsigned char  *AGPReg;
-       unsigned char  *SR16;
        struct SiS_MCLKData  *MCLKData;
 
        unsigned char   *pXGINew_DRAMTypeDefinition;
index 18200eb5fba43b84b456af856c5621b21d940da0..f0fd0ecba1558338717c90159ba71a88cc251925 100644 (file)
@@ -120,8 +120,6 @@ static unsigned char XGI340_AGPReg[12] = {
        0x00, 0x05, 0xd0, 0x10, 0x10, 0x00
 };
 
-static unsigned char XGI340_SR16[4] = {0x03, 0x83, 0x03, 0x83};
-
 const struct XGI_ExtStruct XGI330_EModeIDTable[] = {
        {0x2e, 0x0a1b, 0x0306, 0x06, 0x05, 0x06},
        {0x2f, 0x0a1b, 0x0305, 0x05, 0x05, 0x05},