staging/xgifb: Remove unused values in XGI340_cr41 and XGI27_cr41

In the lookup tables XGI340_cr41 and XGI27_cr41 only the first three
values are used of each 'line', thus the remaining fields can be
removed.

Rationale:
- vb_init.c uses pVBInfo->ram_type for the 'column' index for
pVBInfo->CR40.

- pVBInfo->ram_type is assigned the return value of
  XGINew_GetXG20DRAMType which can only be 0, 1 or 2

- pVBInfo->CR40 is assigned to either XGI340_cr41 or XGI27_cr41 in
vb_setmode.c

-> only the first three values are used.
This becomes also evident as values 3-7 are all 0.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index e570bae..02f3bb5 100644 (file)
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -158,7 +158,7 @@ struct vb_device_info {
        void __iomem *FBAddr;
 
        unsigned char const (*SR15)[8];
-       unsigned char const (*CR40)[8];
+       unsigned char const (*CR40)[3];
 
        struct SiS_MCLKData const *MCLKData;
 

diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
index 34e1656..a1be751 100644 (file)
--- a/drivers/staging/xgifb/vb_table.h
+++ b/drivers/staging/xgifb/vb_table.h
@@ -47,60 +47,60 @@ static const unsigned char XGI340_SR13[4][8] = {
        {0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}  /* SR1B */
 };
 
-static const unsigned char XGI340_cr41[24][8] = {
-       {0x20, 0x50, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 0 CR41 */
-       {0xc4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 1 CR8A */
-       {0xc4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 2 CR8B */
-       {0xb5, 0xa4, 0xa4, 0x00, 0x00, 0x00, 0x00, 0x00},
-       {0xf0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00},
-       {0x90, 0x90, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 5 CR68 */
-       {0x77, 0x77, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 6 CR69 */
-       {0x77, 0x77, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 7 CR6A */
-       {0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 8 CR6D */
-       {0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 9 CR80 */
-       {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 10 CR81 */
-       {0x88, 0xa8, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 11 CR82 */
-       {0x44, 0x44, 0x77, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 12 CR85 */
-       {0x48, 0x48, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 13 CR86 */
-       {0x54, 0x54, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 14 CR90 */
-       {0x54, 0x54, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 15 CR91 */
-       {0x0a, 0x0a, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 16 CR92 */
-       {0x44, 0x44, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 17 CR93 */
-       {0x10, 0x10, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 18 CR94 */
-       {0x11, 0x11, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 19 CR95 */
-       {0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 20 CR96 */
-       {0xf0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 21 CRC3 */
-       {0x05, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 22 CRC4 */
-       {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}  /* 23 CRC5 */
-};
-
-static const unsigned char XGI27_cr41[24][8] = {
-       {0x20, 0x40, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 0 CR41 */
-       {0xC4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 1 CR8A */
-       {0xC4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 2 CR8B */
-       {0xB3, 0x13, 0xa4, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 3 CR40[7],
-                                                              CR99[2:0],
-                                                              CR45[3:0]*/
-       {0xf0, 0xf5, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 4 CR59 */
-       {0x90, 0x90, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 5 CR68 */
-       {0x77, 0x67, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 6 CR69 */
-       {0x77, 0x77, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 7 CR6A */
-       {0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 8 CR6D */
-       {0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 9 CR80 */
-       {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 10 CR81 */
-       {0x88, 0xcc, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 11 CR82 */
-       {0x44, 0x88, 0x77, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 12 CR85 */
-       {0x48, 0x88, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 13 CR86 */
-       {0x54, 0x32, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 14 CR90 */
-       {0x54, 0x33, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 15 CR91 */
-       {0x0a, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 16 CR92 */
-       {0x44, 0x63, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 17 CR93 */
-       {0x10, 0x14, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 18 CR94 */
-       {0x11, 0x0B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 19 CR95 */
-       {0x05, 0x22, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 20 CR96 */
-       {0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 21 CRC3 */
-       {0x05, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 22 CRC4 */
-       {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}  /* 23 CRC5 */
+static const unsigned char XGI340_cr41[24][3] = {
+       {0x20, 0x50, 0x60}, /* 0 CR41 */
+       {0xc4, 0x40, 0x84}, /* 1 CR8A */
+       {0xc4, 0x40, 0x84}, /* 2 CR8B */
+       {0xb5, 0xa4, 0xa4},
+       {0xf0, 0xf0, 0xf0},
+       {0x90, 0x90, 0x24}, /* 5 CR68 */
+       {0x77, 0x77, 0x44}, /* 6 CR69 */
+       {0x77, 0x77, 0x44}, /* 7 CR6A */
+       {0xff, 0xff, 0xff}, /* 8 CR6D */
+       {0x55, 0x55, 0x55}, /* 9 CR80 */
+       {0x00, 0x00, 0x00}, /* 10 CR81 */
+       {0x88, 0xa8, 0x48}, /* 11 CR82 */
+       {0x44, 0x44, 0x77}, /* 12 CR85 */
+       {0x48, 0x48, 0x88}, /* 13 CR86 */
+       {0x54, 0x54, 0x44}, /* 14 CR90 */
+       {0x54, 0x54, 0x44}, /* 15 CR91 */
+       {0x0a, 0x0a, 0x07}, /* 16 CR92 */
+       {0x44, 0x44, 0x44}, /* 17 CR93 */
+       {0x10, 0x10, 0x0A}, /* 18 CR94 */
+       {0x11, 0x11, 0x0a}, /* 19 CR95 */
+       {0x05, 0x05, 0x05}, /* 20 CR96 */
+       {0xf0, 0xf0, 0xf0}, /* 21 CRC3 */
+       {0x05, 0x00, 0x02}, /* 22 CRC4 */
+       {0x00, 0x00, 0x00}  /* 23 CRC5 */
+};
+
+static const unsigned char XGI27_cr41[24][3] = {
+       {0x20, 0x40, 0x60}, /* 0 CR41 */
+       {0xC4, 0x40, 0x84}, /* 1 CR8A */
+       {0xC4, 0x40, 0x84}, /* 2 CR8B */
+       {0xB3, 0x13, 0xa4}, /* 3 CR40[7],
+                                CR99[2:0],
+                                CR45[3:0]*/
+       {0xf0, 0xf5, 0xf0}, /* 4 CR59 */
+       {0x90, 0x90, 0x24}, /* 5 CR68 */
+       {0x77, 0x67, 0x44}, /* 6 CR69 */
+       {0x77, 0x77, 0x44}, /* 7 CR6A */
+       {0xff, 0xff, 0xff}, /* 8 CR6D */
+       {0x55, 0x55, 0x55}, /* 9 CR80 */
+       {0x00, 0x00, 0x00}, /* 10 CR81 */
+       {0x88, 0xcc, 0x48}, /* 11 CR82 */
+       {0x44, 0x88, 0x77}, /* 12 CR85 */
+       {0x48, 0x88, 0x88}, /* 13 CR86 */
+       {0x54, 0x32, 0x44}, /* 14 CR90 */
+       {0x54, 0x33, 0x44}, /* 15 CR91 */
+       {0x0a, 0x07, 0x07}, /* 16 CR92 */
+       {0x44, 0x63, 0x44}, /* 17 CR93 */
+       {0x10, 0x14, 0x0A}, /* 18 CR94 */
+       {0x11, 0x0B, 0x0C}, /* 19 CR95 */
+       {0x05, 0x22, 0x05}, /* 20 CR96 */
+       {0xf0, 0xf0, 0x00}, /* 21 CRC3 */
+       {0x05, 0x00, 0x02}, /* 22 CRC4 */
+       {0x00, 0x00, 0x00}  /* 23 CRC5 */
 };
 
 /* CR47,CR48,CR49,CR4A,CR4B,CR4C,CR70,CR71,CR74,CR75,CR76,CR77 */