Merge branch 'stable/for-linus-3.6' into linux-next

[karo-tx-linux.git] / drivers / staging / xgifb / vb_init.c

diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 6bb020697a5928662c1c2f874c328b8c8e729be7..80dba6a425baa75171ec7bc9659a0176bc72d656 100644 (file)
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -951,7 +951,7 @@ static void xgifb_read_vbios(struct pci_dev *pdev,
        pVBInfo->IF_DEF_LVDS = 0;
        vbios = xgifb_copy_rom(pdev, &vbios_size);
        if (vbios == NULL) {
-               dev_err(&pdev->dev, "video BIOS not available\n");
+               dev_err(&pdev->dev, "Video BIOS not available\n");
                return;
        }
        if (vbios_size <= 0x65)
@@ -1006,7 +1006,7 @@ static void xgifb_read_vbios(struct pci_dev *pdev,
        pVBInfo->IF_DEF_LVDS = 1;
        return;
 error:
-       dev_err(&pdev->dev, "video BIOS corrupted\n");
+       dev_err(&pdev->dev, "Video BIOS corrupted\n");
        vfree(vbios);
 }
 
@@ -1042,9 +1042,8 @@ static void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension,
 
        if (tempbx & tempcx) {
                CR3CData = xgifb_reg_get(pVBInfo->P3d4, 0x3c);
-               if (!(CR3CData & DisplayDeviceFromCMOS)) {
+               if (!(CR3CData & DisplayDeviceFromCMOS))
                        tempcx = 0x1FF0;
-               }
        } else {
                tempcx = 0x1FF0;
        }
@@ -1185,13 +1184,11 @@ static void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension,
 {
        unsigned char Temp;
 
-#if 1
        if (pVBInfo->IF_DEF_LVDS) { /* For XG21 LVDS */
                xgifb_reg_or(pVBInfo->P3d4, 0x32, LCDSense);
                /* LVDS on chip */
                xgifb_reg_and_or(pVBInfo->P3d4, 0x38, ~0xE0, 0xC0);
        } else {
-#endif
                /* Enable GPIOA/B read  */
                xgifb_reg_and_or(pVBInfo->P3d4, 0x4A, ~0x03, 0x03);
                Temp = xgifb_reg_get(pVBInfo->P3d4, 0x48) & 0xC0;
@@ -1214,9 +1211,7 @@ static void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension,
                        /* Disable read GPIOF */
                        xgifb_reg_and(pVBInfo->P3d4, 0x4A, ~0x20);
                }
-#if 1
        }
-#endif
 }
 
 static void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension,