staging: xgifb: delete LCDLenList

LCDLenList is redundant. It's only used for modifying a write-only stack
variable. Delete also related #defines.

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_def.h b/drivers/staging/xgifb/vb_def.h
index 609ab70..77137e4 100644 (file)
--- a/drivers/staging/xgifb/vb_def.h
+++ b/drivers/staging/xgifb/vb_def.h
@@ -104,16 +104,6 @@
 #define ActiveHiTV            0x08
 #define ActiveYPbPr           0x10
 
-/* --------------------------------------------------------- */
-/* translated from asm code 301def.h */
-/*  */
-/* --------------------------------------------------------- */
-#define LVDSCRT1Len_H        8
-#define LVDSCRT1Len_V        7
-#define LCDDesDataLen        6
-#define LVDSDesDataLen2      8
-#define LCDDesDataLen2       8
-
 #define NTSC1024x768HT       1908
 
 #define YPbPrTV525iHT        1716 /* YPbPr */

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index c97e438..6dd8650 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -1337,7 +1337,7 @@ static void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo,
                unsigned short RefreshRateTableIndex,
                struct vb_device_info *pVBInfo)
 {
-       unsigned short i, tempdx, tempcx, tempbx, tempal, modeflag, table;
+       unsigned short i, tempdx, tempbx, tempal, modeflag, table;
 
        struct XGI330_LCDDataTablStruct *tempdi = NULL;
 
@@ -1362,15 +1362,6 @@ static void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo,
                tempal = (tempal & 0x0f);
        }
 
-       tempcx = LCDLenList[tempbx];
-
-       if (pVBInfo->LCDInfo & EnableScalingLCD) { /* ScaleLCD */
-               if (tempbx == 5)
-                       tempcx = LCDDesDataLen2;
-               else if (tempbx == 3)
-                       tempcx = LVDSDesDataLen2;
-       }
-
        switch (tempbx) {
        case 0:
        case 1:

diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
index 14cabdb..fd623f0 100644 (file)
--- a/drivers/staging/xgifb/vb_table.h
+++ b/drivers/staging/xgifb/vb_table.h
@@ -1876,19 +1876,6 @@ static const struct XGI330_TVDataTablStruct XGI_TVDataTable[] = {
        {0xffff, 0x0000, XGI_ExtNTSCData},
 };
 
-static unsigned short LCDLenList[] = {
-       LVDSCRT1Len_H,
-       LVDSCRT1Len_V,
-       LVDSDataLen,
-       LCDDesDataLen,
-       LCDDataLen,
-       LCDDesDataLen,
-       0,
-       LCDDesDataLen,
-       LCDDesDataLen,
-       0
-};
-
 /* Dual link only */
 static struct XGI330_LCDCapStruct  XGI_LCDDLCapList[] = {
 /* LCDCap1024x768 */