]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: xgifb: XGI_SetCRT1VCLK(): avoid copy-paste
authorAaro Koskinen <aaro.koskinen@iki.fi>
Wed, 29 May 2013 20:59:05 +0000 (23:59 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 May 2013 11:55:49 +0000 (20:55 +0900)
Avoid copy-pasted code in if branches by rearranging the checks.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/xgifb/vb_setmode.c

index fa85ab1b75efd8afbe742a376f6a5071c65c0dce..69b6a960888d79a39005c2a63bd129f38ab060ae 100644 (file)
@@ -895,16 +895,10 @@ static void XGI_SetCRT1VCLK(unsigned short ModeNo,
        unsigned char index, data;
        unsigned short vclkindex;
 
-       if (pVBInfo->IF_DEF_LVDS == 1) {
-               index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
-               data = xgifb_reg_get(pVBInfo->P3c4, 0x31) & 0xCF;
-               xgifb_reg_set(pVBInfo->P3c4, 0x31, data);
-               xgifb_reg_set(pVBInfo->P3c4, 0x2B, XGI_VCLKData[index].SR2B);
-               xgifb_reg_set(pVBInfo->P3c4, 0x2C, XGI_VCLKData[index].SR2C);
-               xgifb_reg_set(pVBInfo->P3c4, 0x2D, 0x01);
-       } else if ((pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV
-                       | VB_SIS302LV | VB_XGI301C)) && (pVBInfo->VBInfo
-                       & XGI_SetCRT2ToLCDA)) {
+       if ((pVBInfo->IF_DEF_LVDS == 0) &&
+           (pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV |
+                               VB_SIS302LV | VB_XGI301C)) &&
+           (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA)) {
                vclkindex = XGI_GetVCLK2Ptr(ModeNo, ModeIdIndex,
                                RefreshRateTableIndex, HwDeviceExtension,
                                pVBInfo);