staging/xgifb: Remove dead assignments/increments

The code now contains several dead assignments which are shadowed by
another assignment a few lines later.

-> This patch removes them (and possibly associated code).

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
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 090c424..5c72104 100644 (file)
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -1296,7 +1296,6 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
                xgifb_reg_set(pVBInfo->Part1Port, 0x00, 0x00);
                /* chk if BCLK>=100MHz */
                temp1 = xgifb_reg_get(pVBInfo->P3d4, 0x7B);
-               temp = (unsigned char) ((temp1 >> 4) & 0x0F);
 
                xgifb_reg_set(pVBInfo->Part1Port,
                              0x02, XGI330_CRT2Data_1_2);

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 5fb699d..bee4b38 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -759,7 +759,6 @@ static void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension,
 
        xgifb_reg_and_or(pVBInfo->P3d4, 0x07, ~0x42, tempax);
        data = xgifb_reg_get(pVBInfo->P3d4, 0x07);
-       data &= 0xFF;
        tempax = 0;
 
        if (tempbx & 0x04)
@@ -1589,10 +1588,8 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
        xgifb_reg_and_or(pVBInfo->Part1Port, 0x1a, 0x07,
                                tempax);
 
-       tempcx = pVBInfo->VGAVT;
        tempbx = pVBInfo->VDE;
        tempax = pVBInfo->VGAVDE;
-       tempcx -= tempax;
 
        temp = tempax; /* 0430 ylshieh */
        temp1 = (temp << 18) / tempbx;
@@ -2657,10 +2654,7 @@ static void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex,
                                        tempbx = 775;
                                else if (pVBInfo->VGAVDE == 600)
                                        tempbx = 775;
-                               else
-                                       tempbx = 768;
-                       } else
-                               tempbx = 768;
+                       }
                } else if (pVBInfo->LCDResInfo == Panel_1024x768x75) {
                        tempax = 1024;
                        tempbx = 768;
@@ -3015,9 +3009,6 @@ static void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex,
        temp |= ((tempcx & 0xFF00) >> 8);
        xgifb_reg_set(pVBInfo->Part1Port, 0x12, temp);
 
-       tempax = pVBInfo->VGAVDE;
-       tempbx = pVBInfo->VGAVDE;
-       tempcx = pVBInfo->VGAVT;
        /* BTVGA2VRS 0x10,0x11 */
        tempbx = (pVBInfo->VGAVT + pVBInfo->VGAVDE) >> 1;
        /* BTVGA2VRE 0x11 */
@@ -3226,7 +3217,6 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
                }
        }
        tempbx--;
-       temp = tempbx & 0x00FF;
        tempbx--;
        temp = tempbx & 0x00FF;
        /* 0x10 vertical Blank Start */
@@ -3445,9 +3435,6 @@ static void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex,
        temp &= 0x80;
        xgifb_reg_and_or(pVBInfo->Part2Port, 0x0A, 0xFF, temp);
 
-       if (pVBInfo->VBInfo & SetCRT2ToHiVision)
-               tempax = 950;
-
        if (pVBInfo->TVInfo & TVSetPAL)
                tempax = 520;
        else
@@ -4211,11 +4198,6 @@ static void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex,
 
        tempebx = pVBInfo->VDE;
 
-       if (tempcx & SetCRT2ToHiVision) {
-               if (!(temp & 0xE000))
-                       tempbx = tempbx >> 1;
-       }
-
        tempcx = pVBInfo->RVBHRS;
        temp = tempcx & 0x00FF;
        xgifb_reg_set(pVBInfo->Part4Port, 0x18, temp);