staging: xgifb: XGI_ExtStruct: delete unused fields

Delete unused struct fields.

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_struct.h b/drivers/staging/xgifb/vb_struct.h
index 5dbc8bc5e0f17c8cee9cfedcffb6b65914ae254a..91dba2ff9a88581491b46412a8e40e6888e1a249 100644 (file)
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -14,9 +14,6 @@ struct XGI_ExtStruct {
        unsigned char Ext_ModeID;
        unsigned short Ext_ModeFlag;
        unsigned short Ext_ModeInfo;
-       unsigned short Ext_Point;
-       unsigned short Ext_VESAID;
-       unsigned char Ext_VESAMEMSize;
        unsigned char Ext_RESINFO;
        unsigned char VB_ExtTVFlickerIndex;
        unsigned char VB_ExtTVEdgeIndex;

diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
index d5155063b7a197c4d30970a0993ef5bcf8f774b3..e9d6e7b73350b5ad854f0da32e94a538ec6f69b8 100644 (file)
--- a/drivers/staging/xgifb/vb_table.h
+++ b/drivers/staging/xgifb/vb_table.h
@@ -129,141 +129,75 @@ static unsigned char XG40_CRCF = 0x13;
 static unsigned char XG40_DRAMTypeDefinition = 0xFF ;
 
 static struct XGI_ExtStruct XGI330_EModeIDTable[] = {
-       {0x2e, 0x0a1b, 0x0306, 0x3a57, 0x0101, 0x08,
-               0x06, 0x00, 0x00, 0x05, 0x06},
-       {0x2f, 0x0a1b, 0x0305, 0x3a50, 0x0100, 0x08,
-               0x05, 0x00, 0x00, 0x05, 0x05},
-       {0x30, 0x2a1b, 0x0407, 0x3a81, 0x0103, 0x08,
-               0x07, 0x00, 0x00, 0x07, 0x0e},
-       {0x31, 0x0a1b, 0x030d, 0x3b85, 0x0000, 0x08,
-               0x0d, 0x00, 0x00, 0x06, 0x3d},
-       {0x32, 0x0a1b, 0x0a0e, 0x3b8c, 0x0000, 0x08,
-               0x0e, 0x00, 0x00, 0x06, 0x3e},
-       {0x33, 0x0a1d, 0x0a0d, 0x3b85, 0x0000, 0x08,
-               0x0d, 0x00, 0x00, 0x06, 0x3d},
-       {0x34, 0x2a1d, 0x0a0e, 0x3b8c, 0x0000, 0x08,
-               0x0e, 0x00, 0x00, 0x06, 0x3e},
-       {0x35, 0x0a1f, 0x0a0d, 0x3b85, 0x0000, 0x08,
-               0x0d, 0x00, 0x00, 0x06, 0x3d},
-       {0x36, 0x2a1f, 0x0a0e, 0x3b8c, 0x0000, 0x08,
-               0x0e, 0x00, 0x00, 0x06, 0x3e},
-       {0x38, 0x0a1b, 0x0508, 0x3aab, 0x0105, 0x08,
-               0x08, 0x00, 0x00, 0x00, 0x16},
-       {0x3a, 0x0e3b, 0x0609, 0x3adc, 0x0107, 0x08,
-               0x09, 0x00, 0x00, 0x00, 0x1e},
-       {0x3c, 0x0e3b, 0x070a, 0x3af2, 0x0130, 0x08,
-               0x0a, 0x00, 0x00, 0x00, 0x22},  /* mode 1600x1200
+       {0x2e, 0x0a1b, 0x0306, 0x06, 0x00, 0x00, 0x05, 0x06},
+       {0x2f, 0x0a1b, 0x0305, 0x05, 0x00, 0x00, 0x05, 0x05},
+       {0x30, 0x2a1b, 0x0407, 0x07, 0x00, 0x00, 0x07, 0x0e},
+       {0x31, 0x0a1b, 0x030d, 0x0d, 0x00, 0x00, 0x06, 0x3d},
+       {0x32, 0x0a1b, 0x0a0e, 0x0e, 0x00, 0x00, 0x06, 0x3e},
+       {0x33, 0x0a1d, 0x0a0d, 0x0d, 0x00, 0x00, 0x06, 0x3d},
+       {0x34, 0x2a1d, 0x0a0e, 0x0e, 0x00, 0x00, 0x06, 0x3e},
+       {0x35, 0x0a1f, 0x0a0d, 0x0d, 0x00, 0x00, 0x06, 0x3d},
+       {0x36, 0x2a1f, 0x0a0e, 0x0e, 0x00, 0x00, 0x06, 0x3e},
+       {0x38, 0x0a1b, 0x0508, 0x08, 0x00, 0x00, 0x00, 0x16},
+       {0x3a, 0x0e3b, 0x0609, 0x09, 0x00, 0x00, 0x00, 0x1e},
+       {0x3c, 0x0e3b, 0x070a, 0x0a, 0x00, 0x00, 0x00, 0x22}, /* mode 1600x1200
                                                   add CRT2MODE [2003/10/07] */
-       {0x3d, 0x0e7d, 0x070a, 0x3af2, 0x0131, 0x08,
-               0x0a, 0x00, 0x00, 0x00, 0x22},  /* mode 1600x1200
+       {0x3d, 0x0e7d, 0x070a, 0x0a, 0x00, 0x00, 0x00, 0x22}, /* mode 1600x1200
                                                   add CRT2MODE */
-       {0x40, 0x9a1c, 0x0000, 0x3a34, 0x010d, 0x08,
-               0x00, 0x00, 0x00, 0x04, 0x00},
-       {0x41, 0x9a1d, 0x0000, 0x3a34, 0x010e, 0x08,
-               0x00, 0x00, 0x00, 0x04, 0x00},  /* ModeIdIndex = 0x10 */
-       {0x43, 0x0a1c, 0x0306, 0x3a57, 0x0110, 0x08,
-               0x06, 0x00, 0x00, 0x05, 0x06},
-       {0x44, 0x0a1d, 0x0306, 0x3a57, 0x0111, 0x08,
-               0x06, 0x00, 0x00, 0x05, 0x06},
-       {0x46, 0x2a1c, 0x0407, 0x3a81, 0x0113, 0x08,
-               0x07, 0x00, 0x00, 0x07, 0x0e},
-       {0x47, 0x2a1d, 0x0407, 0x3a81, 0x0114, 0x08,
-               0x07, 0x00, 0x00, 0x07, 0x0e},
-       {0x49, 0x0a3c, 0x0508, 0x3aab, 0x0116, 0x08,
-               0x08, 0x00, 0x00, 0x00, 0x16},
-       {0x4a, 0x0a3d, 0x0508, 0x3aab, 0x0117, 0x08,
-               0x08, 0x00, 0x00, 0x00, 0x16},
-       {0x4c, 0x0e7c, 0x0609, 0x3adc, 0x0119, 0x08,
-               0x09, 0x00, 0x00, 0x00, 0x1e},
-       {0x4d, 0x0e7d, 0x0609, 0x3adc, 0x011a, 0x08,
-               0x09, 0x00, 0x00, 0x00, 0x1e},
-       {0x50, 0x9a1b, 0x0001, 0x3a3b, 0x0132, 0x08,
-               0x01, 0x00, 0x00, 0x04, 0x02},
-       {0x51, 0xba1b, 0x0103, 0x3a42, 0x0133, 0x08,
-               0x03, 0x00, 0x00, 0x07, 0x03},
-       {0x52, 0x9a1b, 0x0204, 0x3a49, 0x0134, 0x08,
-               0x04, 0x00, 0x00, 0x00, 0x04},
-       {0x56, 0x9a1d, 0x0001, 0x3a3b, 0x0135, 0x08,
-               0x01, 0x00, 0x00, 0x04, 0x02},
-       {0x57, 0xba1d, 0x0103, 0x3a42, 0x0136, 0x08,
-               0x03, 0x00, 0x00, 0x07, 0x03},
-       {0x58, 0x9a1d, 0x0204, 0x3a49, 0x0137, 0x08,
-               0x04, 0x00, 0x00, 0x00, 0x04},
-       {0x59, 0x9a1b, 0x0000, 0x3a34, 0x0138, 0x08,
-               0x00, 0x00, 0x00, 0x04, 0x00},
-       {0x5A, 0x021b, 0x0014, 0x3b83, 0x0138, 0x08,
-               0x01, 0x00, 0x00, 0x04, 0x3f},  /* ModeIdIndex = 0x20 */
-       {0x5B, 0x0a1d, 0x0014, 0x3b83, 0x0135, 0x08,
-               0x01, 0x00, 0x00, 0x04, 0x3f},
-       {0x5d, 0x0a1d, 0x0305, 0x3a50, 0x0139, 0x08,
-               0x05, 0x00, 0x00, 0x07, 0x05},
-       {0x62, 0x0a3f, 0x0306, 0x3a57, 0x013a, 0x08,
-               0x06, 0x00, 0x00, 0x05, 0x06},
-       {0x63, 0x2a3f, 0x0407, 0x3a81, 0x013b, 0x08,
-               0x07, 0x00, 0x00, 0x07, 0x0e},
-       {0x64, 0x0a7f, 0x0508, 0x3aab, 0x013c, 0x08,
-               0x08, 0x00, 0x00, 0x00, 0x16},
-       {0x65, 0x0eff, 0x0609, 0x3adc, 0x013d, 0x08,
-               0x09, 0x00, 0x00, 0x00, 0x1e},
-       {0x66, 0x0eff, 0x070a, 0x3af2, 0x013e, 0x08,
-               0x0a, 0x00, 0x00, 0x00, 0x22},  /* mode 1600x1200
+       {0x40, 0x9a1c, 0x0000, 0x00, 0x00, 0x00, 0x04, 0x00},
+       {0x41, 0x9a1d, 0x0000, 0x00, 0x00, 0x00, 0x04, 0x00},
+       {0x43, 0x0a1c, 0x0306, 0x06, 0x00, 0x00, 0x05, 0x06},
+       {0x44, 0x0a1d, 0x0306, 0x06, 0x00, 0x00, 0x05, 0x06},
+       {0x46, 0x2a1c, 0x0407, 0x07, 0x00, 0x00, 0x07, 0x0e},
+       {0x47, 0x2a1d, 0x0407, 0x07, 0x00, 0x00, 0x07, 0x0e},
+       {0x49, 0x0a3c, 0x0508, 0x08, 0x00, 0x00, 0x00, 0x16},
+       {0x4a, 0x0a3d, 0x0508, 0x08, 0x00, 0x00, 0x00, 0x16},
+       {0x4c, 0x0e7c, 0x0609, 0x09, 0x00, 0x00, 0x00, 0x1e},
+       {0x4d, 0x0e7d, 0x0609, 0x09, 0x00, 0x00, 0x00, 0x1e},
+       {0x50, 0x9a1b, 0x0001, 0x01, 0x00, 0x00, 0x04, 0x02},
+       {0x51, 0xba1b, 0x0103, 0x03, 0x00, 0x00, 0x07, 0x03},
+       {0x52, 0x9a1b, 0x0204, 0x04, 0x00, 0x00, 0x00, 0x04},
+       {0x56, 0x9a1d, 0x0001, 0x01, 0x00, 0x00, 0x04, 0x02},
+       {0x57, 0xba1d, 0x0103, 0x03, 0x00, 0x00, 0x07, 0x03},
+       {0x58, 0x9a1d, 0x0204, 0x04, 0x00, 0x00, 0x00, 0x04},
+       {0x59, 0x9a1b, 0x0000, 0x00, 0x00, 0x00, 0x04, 0x00},
+       {0x5A, 0x021b, 0x0014, 0x01, 0x00, 0x00, 0x04, 0x3f},
+       {0x5B, 0x0a1d, 0x0014, 0x01, 0x00, 0x00, 0x04, 0x3f},
+       {0x5d, 0x0a1d, 0x0305, 0x05, 0x00, 0x00, 0x07, 0x05},
+       {0x62, 0x0a3f, 0x0306, 0x06, 0x00, 0x00, 0x05, 0x06},
+       {0x63, 0x2a3f, 0x0407, 0x07, 0x00, 0x00, 0x07, 0x0e},
+       {0x64, 0x0a7f, 0x0508, 0x08, 0x00, 0x00, 0x00, 0x16},
+       {0x65, 0x0eff, 0x0609, 0x09, 0x00, 0x00, 0x00, 0x1e},
+       {0x66, 0x0eff, 0x070a, 0x0a, 0x00, 0x00, 0x00, 0x22}, /* mode 1600x1200
                                                   add CRT2MODE */
-       {0x68, 0x067b, 0x080b, 0x3b17, 0x013f, 0x08,
-               0x0b, 0x00, 0x00, 0x00, 0x29},
-       {0x69, 0x06fd, 0x080b, 0x3b17, 0x0140, 0x08,
-               0x0b, 0x00, 0x00, 0x00, 0x29},
-       {0x6b, 0x07ff, 0x080b, 0x3b17, 0x0141, 0x10,
-               0x0b, 0x00, 0x00, 0x00, 0x29},
-       {0x6c, 0x067b, 0x090c, 0x3b37, 0x0000, 0x08,
-               0x0c, 0x00, 0x00, 0x00, 0x2f},
-       {0x6d, 0x06fd, 0x090c, 0x3b37, 0x0000, 0x10,
-               0x0c, 0x00, 0x00, 0x00, 0x2f},
-       {0x6e, 0x07ff, 0x090c, 0x3b37, 0x0000, 0x10,
-               0x0c, 0x00, 0x00, 0x00, 0x2f},
-       {0x70, 0x2a1b, 0x0410, 0x3b52, 0x0000, 0x08,
-               0x10, 0x00, 0x00, 0x07, 0x34},
-       {0x71, 0x0a1b, 0x0511, 0x3b63, 0x0000, 0x08,
-               0x11, 0x00, 0x00, 0x00, 0x37},
-       {0x74, 0x0a1d, 0x0511, 0x3b63, 0x0000, 0x08,
-               0x11, 0x00, 0x00, 0x00, 0x37},  /* ModeIdIndex = 0x30 */
-       {0x75, 0x0a3d, 0x0612, 0x3b74, 0x0000, 0x08,
-               0x12, 0x00, 0x00, 0x00, 0x3a},
-       {0x76, 0x2a1f, 0x0410, 0x3b52, 0x0000, 0x08,
-               0x10, 0x00, 0x00, 0x07, 0x34},
-       {0x77, 0x0a1f, 0x0511, 0x3b63, 0x0000, 0x08,
-               0x11, 0x00, 0x00, 0x00, 0x37},
-       {0x78, 0x0a3f, 0x0612, 0x3b74, 0x0000, 0x08,
-               0x12, 0x00, 0x00, 0x00, 0x3a},
-       {0x79, 0x0a3b, 0x0612, 0x3b74, 0x0000, 0x08,
-               0x12, 0x00, 0x00, 0x00, 0x3a},
-       {0x7a, 0x2a1d, 0x0410, 0x3b52, 0x0000, 0x08,
-               0x10, 0x00, 0x00, 0x07, 0x34},
-       {0x7b, 0x0e3b, 0x060f, 0x3ad0, 0x0000, 0x08,
-               0x0f, 0x00, 0x00, 0x00, 0x1d},
-       {0x7c, 0x0e7d, 0x060f, 0x3ad0, 0x0000, 0x08,
-               0x0f, 0x00, 0x00, 0x00, 0x1d},
-       {0x7d, 0x0eff, 0x060f, 0x3ad0, 0x0000, 0x08,
-               0x0f, 0x00, 0x00, 0x00, 0x1d},
-       {0x20, 0x0e3b, 0x0D16, 0x49e0, 0x0000, 0x08,
-               0x16, 0x00, 0x00, 0x00, 0x43},
-       {0x21, 0x0e7d, 0x0D16, 0x49e0, 0x0000, 0x08,
-               0x16, 0x00, 0x00, 0x00, 0x43},
-       {0x22, 0x0eff, 0x0D16, 0x49e0, 0x0000, 0x08,
-               0x16, 0x00, 0x00, 0x00, 0x43},
-       {0x23, 0x0e3b, 0x0614, 0x49d5, 0x0000, 0x08,
-               0x14, 0x00, 0x00, 0x00, 0x41},
-       {0x24, 0x0e7d, 0x0614, 0x49d5, 0x0000, 0x08,
-               0x14, 0x00, 0x00, 0x00, 0x41},
-       {0x25, 0x0eff, 0x0614, 0x49d5, 0x0000, 0x08,
-               0x14, 0x00, 0x00, 0x00, 0x41},
-       {0x26, 0x063b, 0x0c15, 0x49dc, 0x0000, 0x08,
-               0x15, 0x00, 0x00, 0x00, 0x42},  /* ModeIdIndex = 0x40 */
-       {0x27, 0x067d, 0x0c15, 0x49dc, 0x0000, 0x08,
-               0x15, 0x00, 0x00, 0x00, 0x42},
-       {0x28, 0x06ff, 0x0c15, 0x49dc, 0x0000, 0x08,
-               0x15, 0x00, 0x00, 0x00, 0x42},
-       {0xff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00}
+       {0x68, 0x067b, 0x080b, 0x0b, 0x00, 0x00, 0x00, 0x29},
+       {0x69, 0x06fd, 0x080b, 0x0b, 0x00, 0x00, 0x00, 0x29},
+       {0x6b, 0x07ff, 0x080b, 0x0b, 0x00, 0x00, 0x00, 0x29},
+       {0x6c, 0x067b, 0x090c, 0x0c, 0x00, 0x00, 0x00, 0x2f},
+       {0x6d, 0x06fd, 0x090c, 0x0c, 0x00, 0x00, 0x00, 0x2f},
+       {0x6e, 0x07ff, 0x090c, 0x0c, 0x00, 0x00, 0x00, 0x2f},
+       {0x70, 0x2a1b, 0x0410, 0x10, 0x00, 0x00, 0x07, 0x34},
+       {0x71, 0x0a1b, 0x0511, 0x11, 0x00, 0x00, 0x00, 0x37},
+       {0x74, 0x0a1d, 0x0511, 0x11, 0x00, 0x00, 0x00, 0x37},
+       {0x75, 0x0a3d, 0x0612, 0x12, 0x00, 0x00, 0x00, 0x3a},
+       {0x76, 0x2a1f, 0x0410, 0x10, 0x00, 0x00, 0x07, 0x34},
+       {0x77, 0x0a1f, 0x0511, 0x11, 0x00, 0x00, 0x00, 0x37},
+       {0x78, 0x0a3f, 0x0612, 0x12, 0x00, 0x00, 0x00, 0x3a},
+       {0x79, 0x0a3b, 0x0612, 0x12, 0x00, 0x00, 0x00, 0x3a},
+       {0x7a, 0x2a1d, 0x0410, 0x10, 0x00, 0x00, 0x07, 0x34},
+       {0x7b, 0x0e3b, 0x060f, 0x0f, 0x00, 0x00, 0x00, 0x1d},
+       {0x7c, 0x0e7d, 0x060f, 0x0f, 0x00, 0x00, 0x00, 0x1d},
+       {0x7d, 0x0eff, 0x060f, 0x0f, 0x00, 0x00, 0x00, 0x1d},
+       {0x20, 0x0e3b, 0x0D16, 0x16, 0x00, 0x00, 0x00, 0x43},
+       {0x21, 0x0e7d, 0x0D16, 0x16, 0x00, 0x00, 0x00, 0x43},
+       {0x22, 0x0eff, 0x0D16, 0x16, 0x00, 0x00, 0x00, 0x43},
+       {0x23, 0x0e3b, 0x0614, 0x14, 0x00, 0x00, 0x00, 0x41},
+       {0x24, 0x0e7d, 0x0614, 0x14, 0x00, 0x00, 0x00, 0x41},
+       {0x25, 0x0eff, 0x0614, 0x14, 0x00, 0x00, 0x00, 0x41},
+       {0x26, 0x063b, 0x0c15, 0x15, 0x00, 0x00, 0x00, 0x42},
+       {0x27, 0x067d, 0x0c15, 0x15, 0x00, 0x00, 0x00, 0x42},
+       {0x28, 0x06ff, 0x0c15, 0x15, 0x00, 0x00, 0x00, 0x42},
+       {0xff, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00}
 };
 
 static struct SiS_StandTable_S XGI330_StandTable = {