Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: xgifb: vb_setmode.c Align match parenthesis

Make suggested checkpatch modification for
CHECK: Alignment should match open parenthesis

Signed-off-by: Walt Feasel <waltfeasel@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Walt Feasel and committed by
Greg Kroah-Hartman
df5d4312 cf99b357

+141 -158
+141 -158
drivers/staging/xgifb/vb_setmode.c
··· 167 167 } 168 168 169 169 static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, 170 - unsigned short RefreshRateTableIndex, unsigned short *i, 170 + unsigned short RefreshRateTableIndex, 171 + unsigned short *i, 171 172 struct vb_device_info *pVBInfo) 172 173 { 173 174 unsigned short tempax, tempbx, resinfo, modeflag, infoflag; ··· 245 244 } 246 245 247 246 static void XGI_SetSync(unsigned short RefreshRateTableIndex, 248 - struct vb_device_info *pVBInfo) 247 + struct vb_device_info *pVBInfo) 249 248 { 250 249 unsigned short sync, temp; 251 250 ··· 258 257 } 259 258 260 259 static void XGI_SetCRT1Timing_H(struct vb_device_info *pVBInfo, 261 - struct xgi_hw_device_info *HwDeviceExtension) 260 + struct xgi_hw_device_info *HwDeviceExtension) 262 261 { 263 262 unsigned char data, data1, pushax; 264 263 unsigned short i, j; ··· 360 359 } 361 360 362 361 static void XGI_SetCRT1CRTC(unsigned short ModeIdIndex, 363 - unsigned short RefreshRateTableIndex, 364 - struct vb_device_info *pVBInfo, 365 - struct xgi_hw_device_info *HwDeviceExtension) 362 + unsigned short RefreshRateTableIndex, 363 + struct vb_device_info *pVBInfo, 364 + struct xgi_hw_device_info *HwDeviceExtension) 366 365 { 367 366 unsigned char index, data; 368 367 unsigned short i; ··· 398 397 * Description : Set LCD timing 399 398 */ 400 399 static void XGI_SetXG21CRTC(unsigned short RefreshRateTableIndex, 401 - struct vb_device_info *pVBInfo) 400 + struct vb_device_info *pVBInfo) 402 401 { 403 402 unsigned char index, Tempax, Tempbx, Tempcx, Tempdx; 404 403 unsigned short Temp1, Temp2, Temp3; ··· 666 665 667 666 if (index != -1) { 668 667 xgifb_reg_set(pVBInfo->P3d4, 0x02, 669 - XGI_UpdateCRT1Table[index].CR02); 668 + XGI_UpdateCRT1Table[index].CR02); 670 669 xgifb_reg_set(pVBInfo->P3d4, 0x03, 671 - XGI_UpdateCRT1Table[index].CR03); 670 + XGI_UpdateCRT1Table[index].CR03); 672 671 xgifb_reg_set(pVBInfo->P3d4, 0x15, 673 - XGI_UpdateCRT1Table[index].CR15); 672 + XGI_UpdateCRT1Table[index].CR15); 674 673 xgifb_reg_set(pVBInfo->P3d4, 0x16, 675 - XGI_UpdateCRT1Table[index].CR16); 674 + XGI_UpdateCRT1Table[index].CR16); 676 675 } 677 676 } 678 677 679 678 static void XGI_SetCRT1DE(unsigned short ModeIdIndex, 680 - unsigned short RefreshRateTableIndex, 681 - struct vb_device_info *pVBInfo) 679 + unsigned short RefreshRateTableIndex, 680 + struct vb_device_info *pVBInfo) 682 681 { 683 682 unsigned short resindex, tempax, tempbx, tempcx, temp, modeflag; 684 683 ··· 716 715 xgifb_reg_set(pVBInfo->P3d4, 0x11, data); /* Unlock CRTC */ 717 716 xgifb_reg_set(pVBInfo->P3d4, 0x01, (unsigned short)(tempcx & 0xff)); 718 717 xgifb_reg_and_or(pVBInfo->P3d4, 0x0b, ~0x0c, 719 - (unsigned short)((tempcx & 0x0ff00) >> 10)); 718 + (unsigned short)((tempcx & 0x0ff00) >> 10)); 720 719 xgifb_reg_set(pVBInfo->P3d4, 0x12, (unsigned short)(tempbx & 0xff)); 721 720 tempax = 0; 722 721 tempbx >>= 8; ··· 823 822 } 824 823 825 824 static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeIdIndex, 826 - unsigned short RefreshRateTableIndex, 827 - struct vb_device_info *pVBInfo) 825 + unsigned short RefreshRateTableIndex, 826 + struct vb_device_info *pVBInfo) 828 827 { 829 828 unsigned short VCLKIndex, modeflag; 830 829 ··· 952 951 } 953 952 954 953 static void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension, 955 - unsigned short RefreshRateTableIndex, 956 - struct vb_device_info *pVBInfo) 954 + unsigned short RefreshRateTableIndex, 955 + struct vb_device_info *pVBInfo) 957 956 { 958 957 unsigned short data, data2 = 0; 959 958 short VCLK; ··· 990 989 } 991 990 992 991 static void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension, 993 - unsigned short ModeIdIndex, 994 - unsigned short RefreshRateTableIndex, 995 - struct vb_device_info *pVBInfo) 992 + unsigned short ModeIdIndex, 993 + unsigned short RefreshRateTableIndex, 994 + struct vb_device_info *pVBInfo) 996 995 { 997 996 unsigned short data, data2, data3, infoflag = 0, modeflag, resindex, 998 997 xres; ··· 1188 1187 } 1189 1188 1190 1189 static void const *XGI_GetLcdPtr(struct XGI330_LCDDataTablStruct const *table, 1191 - unsigned short ModeIdIndex, 1192 - struct vb_device_info *pVBInfo) 1190 + unsigned short ModeIdIndex, 1191 + struct vb_device_info *pVBInfo) 1193 1192 { 1194 1193 unsigned short i, tempdx, tempbx, modeflag; 1195 1194 ··· 1227 1226 } 1228 1227 1229 1228 static struct SiS_TVData const *XGI_GetTVPtr(unsigned short ModeIdIndex, 1230 - unsigned short RefreshRateTableIndex, 1231 - struct vb_device_info *pVBInfo) 1229 + unsigned short RefreshRateTableIndex, 1230 + struct vb_device_info *pVBInfo) 1232 1231 { 1233 1232 unsigned short i, tempdx, tempal, modeflag; 1234 1233 ··· 1442 1441 tempbx >>= 3; 1443 1442 1444 1443 xgifb_reg_set(pVBInfo->Part1Port, 0x16, 1445 - (unsigned short)(tempbx & 0xff)); 1444 + (unsigned short)(tempbx & 0xff)); 1446 1445 xgifb_reg_set(pVBInfo->Part1Port, 0x17, 1447 - (unsigned short)(tempcx & 0xff)); 1446 + (unsigned short)(tempcx & 0xff)); 1448 1447 1449 1448 tempax = pVBInfo->HT; 1450 1449 ··· 1470 1469 1471 1470 xgifb_reg_set(pVBInfo->Part1Port, 0x15, tempax); 1472 1471 xgifb_reg_set(pVBInfo->Part1Port, 0x14, 1473 - (unsigned short)(tempbx & 0xff)); 1472 + (unsigned short)(tempbx & 0xff)); 1474 1473 1475 1474 tempax = pVBInfo->VT; 1476 1475 tempbx = LCDPtr1->LCDVDES; ··· 1481 1480 if (tempcx >= tempax) 1482 1481 tempcx -= tempax; 1483 1482 1484 - xgifb_reg_set(pVBInfo->Part1Port, 0x1b, 1485 - (unsigned short)(tempbx & 0xff)); 1486 - xgifb_reg_set(pVBInfo->Part1Port, 0x1c, 1487 - (unsigned short)(tempcx & 0xff)); 1483 + xgifb_reg_set(pVBInfo->Part1Port, 0x1b, (unsigned short)(tempbx & 0xff)); 1484 + xgifb_reg_set(pVBInfo->Part1Port, 0x1c, (unsigned short)(tempcx & 0xff)); 1488 1485 1489 1486 tempbx = (tempbx >> 8) & 0x07; 1490 1487 tempcx = (tempcx >> 8) & 0x07; 1491 1488 1492 - xgifb_reg_set(pVBInfo->Part1Port, 0x1d, 1493 - (unsigned short)((tempcx << 3) 1494 - | tempbx)); 1489 + xgifb_reg_set(pVBInfo->Part1Port, 0x1d, (unsigned short)((tempcx << 3) | 1490 + tempbx)); 1495 1491 1496 1492 tempax = pVBInfo->VT; 1497 1493 tempbx = LCDPtr1->LCDVRS; ··· 1502 1504 if (tempcx >= tempax) 1503 1505 tempcx -= tempax; 1504 1506 1505 - xgifb_reg_set(pVBInfo->Part1Port, 0x18, 1506 - (unsigned short)(tempbx & 0xff)); 1507 - xgifb_reg_and_or(pVBInfo->Part1Port, 0x19, ~0x0f, 1508 - (unsigned short)(tempcx & 0x0f)); 1507 + xgifb_reg_set(pVBInfo->Part1Port, 0x18, (unsigned short)(tempbx & 0xff)); 1508 + xgifb_reg_and_or(pVBInfo->Part1Port, 0x19, ~0x0f, (unsigned short)(tempcx & 0x0f)); 1509 1509 1510 1510 tempax = ((tempbx >> 8) & 0x07) << 3; 1511 1511 ··· 1514 1518 if (pVBInfo->LCDInfo & XGI_EnableLVDSDDA) 1515 1519 tempax |= 0x40; 1516 1520 1517 - xgifb_reg_and_or(pVBInfo->Part1Port, 0x1a, 0x07, 1518 - tempax); 1521 + xgifb_reg_and_or(pVBInfo->Part1Port, 0x1a, 0x07, tempax); 1519 1522 1520 1523 tempbx = pVBInfo->VDE; 1521 1524 tempax = pVBInfo->VGAVDE; ··· 1530 1535 temp2 = temp1; 1531 1536 push3 = temp2; 1532 1537 1533 - xgifb_reg_set(pVBInfo->Part1Port, 0x37, 1534 - (unsigned short)(temp2 & 0xff)); 1535 - xgifb_reg_set(pVBInfo->Part1Port, 0x36, 1536 - (unsigned short)((temp2 >> 8) & 0xff)); 1538 + xgifb_reg_set(pVBInfo->Part1Port, 0x37, (unsigned short)(temp2 & 0xff)); 1539 + xgifb_reg_set(pVBInfo->Part1Port, 0x36, (unsigned short)((temp2 >> 8) & 0xff)); 1537 1540 1538 1541 tempbx = (unsigned short)(temp2 >> 16); 1539 1542 tempax = tempbx & 0x03; ··· 1552 1559 (unsigned short)((temp2 >> 8) & 1553 1560 0xff)); 1554 1561 tempbx = (unsigned short)(temp2 >> 16); 1555 - xgifb_reg_and_or(pVBInfo->Part4Port, 0x3a, 1556 - ~0xc0, 1557 - (unsigned short)((tempbx & 1558 - 0xff) << 6)); 1562 + xgifb_reg_and_or(pVBInfo->Part4Port, 0x3a, ~0xc0, 1563 + (unsigned short)((tempbx & 0xff) << 6)); 1559 1564 1560 1565 tempcx = pVBInfo->VGAVDE; 1561 1566 if (tempcx == pVBInfo->VDE) 1562 - xgifb_reg_and_or(pVBInfo->Part4Port, 1563 - 0x30, ~0x0c, 0x00); 1567 + xgifb_reg_and_or(pVBInfo->Part4Port, 0x30, ~0x0c, 0x00); 1564 1568 else 1565 - xgifb_reg_and_or(pVBInfo->Part4Port, 1566 - 0x30, ~0x0c, 0x08); 1569 + xgifb_reg_and_or(pVBInfo->Part4Port, 0x30, ~0x0c, 0x08); 1567 1570 } 1568 1571 1569 1572 tempcx = pVBInfo->VGAHDE; ··· 1593 1604 1594 1605 tempax = ((tempbx >> 8) & 0xff) << 3; 1595 1606 tempax |= (unsigned short)((temp3 >> 8) & 0x07); 1596 - xgifb_reg_set(pVBInfo->Part1Port, 0x20, 1597 - (unsigned short)(tempax & 0xff)); 1598 - xgifb_reg_set(pVBInfo->Part1Port, 0x21, 1599 - (unsigned short)(tempbx & 0xff)); 1607 + xgifb_reg_set(pVBInfo->Part1Port, 0x20, (unsigned short)(tempax & 0xff)); 1608 + xgifb_reg_set(pVBInfo->Part1Port, 0x21, (unsigned short)(tempbx & 0xff)); 1600 1609 1601 1610 temp3 >>= 16; 1602 1611 1603 1612 if (modeflag & HalfDCLK) 1604 1613 temp3 >>= 1; 1605 1614 1606 - xgifb_reg_set(pVBInfo->Part1Port, 0x22, 1607 - (unsigned short)((temp3 >> 8) & 0xff)); 1608 - xgifb_reg_set(pVBInfo->Part1Port, 0x23, 1609 - (unsigned short)(temp3 & 0xff)); 1615 + xgifb_reg_set(pVBInfo->Part1Port, 0x22, (unsigned short)((temp3 >> 8) & 0xff)); 1616 + xgifb_reg_set(pVBInfo->Part1Port, 0x23, (unsigned short)(temp3 & 0xff)); 1610 1617 } 1611 1618 1612 1619 /* ··· 1612 1627 * Description : 1613 1628 */ 1614 1629 static void XGI_GetLCDVCLKPtr(unsigned char *di_0, unsigned char *di_1, 1615 - struct vb_device_info *pVBInfo) 1630 + struct vb_device_info *pVBInfo) 1616 1631 { 1617 1632 unsigned short index; 1618 1633 ··· 1630 1645 } 1631 1646 1632 1647 static unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex, 1633 - unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) 1648 + unsigned short ModeIdIndex, 1649 + struct vb_device_info *pVBInfo) 1634 1650 { 1635 1651 unsigned short index, modeflag; 1636 1652 unsigned char tempal; ··· 1691 1705 } 1692 1706 1693 1707 static void XGI_GetVCLKLen(unsigned char tempal, unsigned char *di_0, 1694 - unsigned char *di_1, struct vb_device_info *pVBInfo) 1708 + unsigned char *di_1, struct vb_device_info *pVBInfo) 1695 1709 { 1696 1710 if (pVBInfo->VBType & (VB_SIS301 | VB_SIS301B | VB_SIS302B 1697 1711 | VB_SIS301LV | VB_SIS302LV | VB_XGI301C)) { ··· 1707 1721 } 1708 1722 1709 1723 static void XGI_SetCRT2ECLK(unsigned short ModeIdIndex, 1710 - unsigned short RefreshRateTableIndex, 1711 - struct vb_device_info *pVBInfo) 1724 + unsigned short RefreshRateTableIndex, 1725 + struct vb_device_info *pVBInfo) 1712 1726 { 1713 1727 unsigned char di_0, di_1, tempal; 1714 1728 int i; ··· 1719 1733 1720 1734 for (i = 0; i < 4; i++) { 1721 1735 xgifb_reg_and_or(pVBInfo->P3d4, 0x31, ~0x30, 1722 - (unsigned short)(0x10 * i)); 1736 + (unsigned short)(0x10 * i)); 1723 1737 if (!(pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) && 1724 1738 !(pVBInfo->VBInfo & SetInSlaveMode)) { 1725 1739 xgifb_reg_set(pVBInfo->P3c4, 0x2e, di_0); ··· 1857 1871 pVBInfo->VBType = tempbx; 1858 1872 } 1859 1873 1860 - static void XGI_GetVBInfo(unsigned short ModeIdIndex, 1861 - struct vb_device_info *pVBInfo) 1874 + static void XGI_GetVBInfo(unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) 1862 1875 { 1863 1876 unsigned short tempax, push, tempbx, temp, modeflag; 1864 1877 ··· 1982 1997 pVBInfo->VBInfo = tempbx; 1983 1998 } 1984 1999 1985 - static void XGI_GetTVInfo(unsigned short ModeIdIndex, 1986 - struct vb_device_info *pVBInfo) 2000 + static void XGI_GetTVInfo(unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) 1987 2001 { 1988 2002 unsigned short tempbx = 0, resinfo = 0, modeflag, index1; 1989 2003 ··· 2208 2224 * 000001b : clear bit 0, to set bit0 2209 2225 */ 2210 2226 static void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl, 2211 - struct vb_device_info *pVBInfo) 2227 + struct vb_device_info *pVBInfo) 2212 2228 { 2213 2229 unsigned char CR4A, temp; 2214 2230 ··· 2233 2249 } 2234 2250 2235 2251 static void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl, 2236 - struct vb_device_info *pVBInfo) 2252 + struct vb_device_info *pVBInfo) 2237 2253 { 2238 2254 unsigned char CR4A, temp; 2239 2255 unsigned short tempbh0, tempbl0; ··· 2263 2279 } 2264 2280 2265 2281 static void XGI_DisplayOn(struct xgifb_video_info *xgifb_info, 2266 - struct xgi_hw_device_info *pXGIHWDE, 2267 - struct vb_device_info *pVBInfo) 2282 + struct xgi_hw_device_info *pXGIHWDE, 2283 + struct vb_device_info *pVBInfo) 2268 2284 { 2269 2285 xgifb_reg_and_or(pVBInfo->P3c4, 0x01, 0xDF, 0x00); 2270 2286 if (pXGIHWDE->jChipType == XG21) { ··· 2307 2323 } 2308 2324 2309 2325 void XGI_DisplayOff(struct xgifb_video_info *xgifb_info, 2310 - struct xgi_hw_device_info *pXGIHWDE, 2311 - struct vb_device_info *pVBInfo) 2326 + struct xgi_hw_device_info *pXGIHWDE, 2327 + struct vb_device_info *pVBInfo) 2312 2328 { 2313 2329 if (pXGIHWDE->jChipType == XG21) { 2314 2330 if (pVBInfo->IF_DEF_LVDS == 1) { ··· 2427 2443 static unsigned char XGI_IsLCDDualLink(struct vb_device_info *pVBInfo) 2428 2444 { 2429 2445 if ((pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) && 2430 - (pVBInfo->LCDInfo & SetLCDDualLink)) /* shampoo0129 */ 2446 + (pVBInfo->LCDInfo & SetLCDDualLink)) /* shampoo0129 */ 2431 2447 return 1; 2432 2448 2433 2449 return 0; ··· 2475 2491 } 2476 2492 2477 2493 static void XGI_GetCRT2Data(unsigned short ModeIdIndex, 2478 - unsigned short RefreshRateTableIndex, 2479 - struct vb_device_info *pVBInfo) 2494 + unsigned short RefreshRateTableIndex, 2495 + struct vb_device_info *pVBInfo) 2480 2496 { 2481 2497 unsigned short tempax = 0, tempbx = 0, modeflag, resinfo; 2482 2498 ··· 2645 2661 } 2646 2662 2647 2663 static void XGI_SetCRT2VCLK(unsigned short ModeIdIndex, 2648 - unsigned short RefreshRateTableIndex, 2649 - struct vb_device_info *pVBInfo) 2664 + unsigned short RefreshRateTableIndex, 2665 + struct vb_device_info *pVBInfo) 2650 2666 { 2651 2667 unsigned char di_0, di_1, tempal; 2652 2668 ··· 2717 2733 } 2718 2734 2719 2735 static void XGI_SetCRT2Offset(unsigned short ModeNo, 2720 - unsigned short ModeIdIndex, 2721 - unsigned short RefreshRateTableIndex, 2722 - struct vb_device_info *pVBInfo) 2736 + unsigned short ModeIdIndex, 2737 + unsigned short RefreshRateTableIndex, 2738 + struct vb_device_info *pVBInfo) 2723 2739 { 2724 2740 unsigned short offset; 2725 2741 unsigned char temp; ··· 2745 2761 } 2746 2762 2747 2763 static void XGI_PreSetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, 2748 - unsigned short RefreshRateTableIndex, 2749 - struct vb_device_info *pVBInfo) 2764 + unsigned short RefreshRateTableIndex, 2765 + struct vb_device_info *pVBInfo) 2750 2766 { 2751 2767 u8 tempcx; 2752 2768 ··· 2761 2777 } 2762 2778 2763 2779 static void XGI_SetGroup1(unsigned short ModeIdIndex, 2764 - unsigned short RefreshRateTableIndex, 2765 - struct vb_device_info *pVBInfo) 2780 + unsigned short RefreshRateTableIndex, 2781 + struct vb_device_info *pVBInfo) 2766 2782 { 2767 2783 unsigned short temp = 0, tempax = 0, tempbx = 0, tempcx = 0, 2768 2784 pushbx = 0, CRT1Index, modeflag; ··· 2915 2931 } 2916 2932 2917 2933 static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex, 2918 - struct vb_device_info *pVBInfo) 2934 + struct vb_device_info *pVBInfo) 2919 2935 { 2920 2936 unsigned short push1, push2, tempax, tempbx = 0, tempcx, temp, resinfo, 2921 2937 modeflag; ··· 3022 3038 if (ModeNo == 0x50) { 3023 3039 if (pVBInfo->TVInfo == SetNTSCTV) { 3024 3040 xgifb_reg_set(pVBInfo->Part1Port, 3025 - 0x07, 0x30); 3041 + 0x07, 0x30); 3026 3042 xgifb_reg_set(pVBInfo->Part1Port, 3027 - 0x08, 0x03); 3043 + 0x08, 0x03); 3028 3044 } else { 3029 3045 xgifb_reg_set(pVBInfo->Part1Port, 3030 - 0x07, 0x2f); 3046 + 0x07, 0x2f); 3031 3047 xgifb_reg_set(pVBInfo->Part1Port, 3032 - 0x08, 0x02); 3048 + 0x08, 0x02); 3033 3049 } 3034 3050 } 3035 3051 } ··· 3205 3221 } 3206 3222 3207 3223 static void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex, 3208 - struct vb_device_info *pVBInfo) 3224 + struct vb_device_info *pVBInfo) 3209 3225 { 3210 3226 unsigned short i, j, tempax, tempbx, tempcx, temp, push1, push2, 3211 3227 modeflag; ··· 3607 3623 TimingPoint = XGI_NTSC1024AdjTime; 3608 3624 for (i = 0x1c, j = 0; i <= 0x30; i++, j++) { 3609 3625 xgifb_reg_set(pVBInfo->Part2Port, i, 3610 - TimingPoint[j]); 3626 + TimingPoint[j]); 3611 3627 } 3612 3628 xgifb_reg_set(pVBInfo->Part2Port, 0x43, 0x72); 3613 3629 } ··· 3617 3633 if (pVBInfo->VBType & VB_XGI301C) { 3618 3634 if (pVBInfo->TVInfo & TVSetPALM) 3619 3635 xgifb_reg_and_or(pVBInfo->Part2Port, 0x4E, ~0x08, 3620 - 0x08); /* PALM Mode */ 3636 + 0x08); /* PALM Mode */ 3621 3637 } 3622 3638 3623 3639 if (pVBInfo->TVInfo & TVSetPALM) { ··· 3634 3650 } 3635 3651 } 3636 3652 3637 - static void XGI_SetLCDRegs(unsigned short ModeIdIndex, 3638 - struct vb_device_info *pVBInfo) 3653 + static void XGI_SetLCDRegs(unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) 3639 3654 { 3640 3655 unsigned short pushbx, tempax, tempbx, tempcx, temp, tempah, 3641 3656 tempbh, tempch; ··· 3859 3876 3860 3877 if (pVBInfo->VBInfo & SetCRT2ToYPbPr525750) { 3861 3878 if ((pVBInfo->TVInfo & TVSetYPbPr525i) || 3862 - (pVBInfo->TVInfo & TVSetYPbPr525p)) 3879 + (pVBInfo->TVInfo & TVSetYPbPr525p)) 3863 3880 Tap4TimingPtr = xgifb_ntsc_525_tap4_timing; 3864 3881 if (pVBInfo->TVInfo & TVSetYPbPr750p) 3865 3882 Tap4TimingPtr = YPbPr750pTap4Timing; ··· 3965 3982 } 3966 3983 3967 3984 static void XGI_SetGroup4(unsigned short ModeIdIndex, 3968 - unsigned short RefreshRateTableIndex, 3969 - struct vb_device_info *pVBInfo) 3985 + unsigned short RefreshRateTableIndex, 3986 + struct vb_device_info *pVBInfo) 3970 3987 { 3971 3988 unsigned short tempax, tempcx, tempbx, modeflag, temp, temp2; 3972 3989 ··· 4109 4126 | TVSetHiVision))) { 4110 4127 temp |= 0x0001; 4111 4128 if ((pVBInfo->VBInfo & SetInSlaveMode) && 4112 - !(pVBInfo->TVInfo 4113 - & TVSimuMode)) 4129 + !(pVBInfo->TVInfo & TVSimuMode)) 4114 4130 temp &= (~0x0001); 4115 4131 } 4116 4132 } ··· 4150 4168 } 4151 4169 4152 4170 static unsigned char XGI_XG21CheckLVDSMode(struct xgifb_video_info *xgifb_info, 4153 - unsigned short ModeNo, unsigned short ModeIdIndex) 4171 + unsigned short ModeNo, 4172 + unsigned short ModeIdIndex) 4154 4173 { 4155 4174 unsigned short xres, yres, colordepth, modeflag, resindex; 4156 4175 ··· 4331 4348 if (chip_id == XG27) { 4332 4349 /* Panel VRS SR35[2:0] SR34[7:0] */ 4333 4350 xgifb_reg_and_or(pVBInfo->P3c4, 0x35, ~0x07, 4334 - (value & 0x700) >> 8); 4351 + (value & 0x700) >> 8); 4335 4352 xgifb_reg_set(pVBInfo->P3c4, 0x34, value & 0xFF); 4336 4353 } else { 4337 4354 /* Panel VRS SR3F[1:0] SR34[7:0] SR33[0] */ 4338 4355 xgifb_reg_and_or(pVBInfo->P3c4, 0x3F, ~0x03, 4339 - (value & 0x600) >> 9); 4356 + (value & 0x600) >> 9); 4340 4357 xgifb_reg_set(pVBInfo->P3c4, 0x34, (value >> 1) & 0xFF); 4341 4358 xgifb_reg_and_or(pVBInfo->P3d4, 0x33, ~0x01, value & 0x01); 4342 4359 } ··· 4349 4366 /* Panel VRE SR3F[7:2] */ 4350 4367 if (chip_id == XG27) 4351 4368 xgifb_reg_and_or(pVBInfo->P3c4, 0x3F, ~0xFC, 4352 - (value << 2) & 0xFC); 4369 + (value << 2) & 0xFC); 4353 4370 else 4354 4371 /* SR3F[7] has to be 0, h/w bug */ 4355 4372 xgifb_reg_and_or(pVBInfo->P3c4, 0x3F, ~0xFC, 4356 - (value << 2) & 0x7C); 4373 + (value << 2) & 0x7C); 4357 4374 4358 4375 for (temp = 0, value = 0; temp < 3; temp++) { 4359 4376 xgifb_reg_and_or(pVBInfo->P3c4, 0x31, ~0x30, value); ··· 4398 4415 } 4399 4416 4400 4417 static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info, 4401 - struct xgi_hw_device_info *HwDeviceExtension, 4402 - struct vb_device_info *pVBInfo) 4418 + struct xgi_hw_device_info *HwDeviceExtension, 4419 + struct vb_device_info *pVBInfo) 4403 4420 { 4404 4421 unsigned short tempah = 0; 4405 4422 ··· 4529 4546 * Description : 4530 4547 */ 4531 4548 static void XGI_GetTVPtrIndex2(unsigned short *tempbx, unsigned char *tempcl, 4532 - unsigned char *tempch, struct vb_device_info *pVBInfo) 4549 + unsigned char *tempch, struct vb_device_info *pVBInfo) 4533 4550 { 4534 4551 *tempbx = 0; 4535 4552 *tempcl = 0; ··· 4614 4631 4615 4632 if (temp & LCDRGB18Bit) { 4616 4633 xgifb_reg_and_or(pVBInfo->Part1Port, 0x19, 0x0F, 4617 - /* Enable Dither */ 4618 - (unsigned short)(0x20 | (tempcx & 0x00C0))); 4634 + /* Enable Dither */ 4635 + (unsigned short)(0x20 | (tempcx & 0x00C0))); 4619 4636 xgifb_reg_and_or(pVBInfo->Part1Port, 0x1A, 0x7F, 0x80); 4620 4637 } else { 4621 4638 xgifb_reg_and_or(pVBInfo->Part1Port, 0x19, 0x0F, 4622 - (unsigned short)(0x30 | (tempcx & 0x00C0))); 4639 + (unsigned short)(0x30 | (tempcx & 0x00C0))); 4623 4640 xgifb_reg_and_or(pVBInfo->Part1Port, 0x1A, 0x7F, 0x00); 4624 4641 } 4625 4642 } ··· 4635 4652 { 4636 4653 if (tempcx & EnableLCD24bpp) /* 24bits */ 4637 4654 xgifb_reg_and_or(pVBInfo->Part2Port, 0x1A, 0xE0, 4638 - (unsigned short)(((tempcx & 0x00ff) >> 6) 4639 - | 0x0c)); 4655 + (unsigned short)(((tempcx & 0x00ff) >> 6) | 0x0c)); 4640 4656 else 4641 4657 xgifb_reg_and_or(pVBInfo->Part2Port, 0x1A, 0xE0, 4642 - (unsigned short)(((tempcx & 0x00ff) >> 6) 4643 - | 0x18)); /* Enable Dither */ 4658 + (unsigned short)(((tempcx & 0x00ff) >> 6) | 0x18)); 4659 + /* Enable Dither */ 4644 4660 } 4645 4661 4646 4662 static void XGI_LongWait(struct vb_device_info *pVBInfo) ··· 4674 4692 XGI_LongWait(pVBInfo); 4675 4693 4676 4694 xgifb_reg_set(pVBInfo->Part4Port, 0x31, 4677 - pVBInfo->LCDCapList[index].Spectrum_31); 4695 + pVBInfo->LCDCapList[index].Spectrum_31); 4678 4696 xgifb_reg_set(pVBInfo->Part4Port, 0x32, 4679 - pVBInfo->LCDCapList[index].Spectrum_32); 4697 + pVBInfo->LCDCapList[index].Spectrum_32); 4680 4698 xgifb_reg_set(pVBInfo->Part4Port, 0x33, 4681 - pVBInfo->LCDCapList[index].Spectrum_33); 4699 + pVBInfo->LCDCapList[index].Spectrum_33); 4682 4700 xgifb_reg_set(pVBInfo->Part4Port, 0x34, 4683 - pVBInfo->LCDCapList[index].Spectrum_34); 4701 + pVBInfo->LCDCapList[index].Spectrum_34); 4684 4702 XGI_LongWait(pVBInfo); 4685 4703 xgifb_reg_or(pVBInfo->Part4Port, 0x30, 0x40); /* enable spectrum */ 4686 4704 } ··· 4697 4715 (VB_SIS301LV | VB_SIS302LV | VB_XGI301C)) { 4698 4716 /* Set 301LV Capability */ 4699 4717 xgifb_reg_set(pVBInfo->Part4Port, 0x24, 4700 - (unsigned char)(tempcx & 0x1F)); 4718 + (unsigned char)(tempcx & 0x1F)); 4701 4719 } 4702 4720 /* VB Driving */ 4703 4721 xgifb_reg_and_or(pVBInfo->Part4Port, 0x0D, 4704 - ~((EnableVBCLKDRVLOW | EnablePLLSPLOW) >> 8), 4705 - (unsigned short)((tempcx & (EnableVBCLKDRVLOW 4706 - | EnablePLLSPLOW)) >> 8)); 4722 + ~((EnableVBCLKDRVLOW | EnablePLLSPLOW) >> 8), 4723 + (unsigned short)((tempcx & (EnableVBCLKDRVLOW | 4724 + EnablePLLSPLOW)) >> 8)); 4707 4725 4708 4726 if (pVBInfo->VBInfo & SetCRT2ToLCD) 4709 4727 XGI_SetLCDCap_B(tempcx, pVBInfo); ··· 5044 5062 } 5045 5063 5046 5064 unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, 5047 - unsigned short ModeNo, unsigned short ModeIdIndex, 5048 - struct vb_device_info *pVBInfo) 5065 + unsigned short ModeNo, 5066 + unsigned short ModeIdIndex, 5067 + struct vb_device_info *pVBInfo) 5049 5068 { 5050 5069 const u8 LCDARefreshIndex[] = { 5051 5070 0x00, 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x00 }; ··· 5120 5137 } 5121 5138 5122 5139 static void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex, 5123 - struct xgi_hw_device_info *HwDeviceExtension, 5124 - struct vb_device_info *pVBInfo) 5140 + struct xgi_hw_device_info *HwDeviceExtension, 5141 + struct vb_device_info *pVBInfo) 5125 5142 { 5126 5143 unsigned short RefreshRateTableIndex; 5127 5144 5128 5145 pVBInfo->SetFlag |= ProgrammingCRT2; 5129 5146 RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo, 5130 - ModeIdIndex, pVBInfo); 5147 + ModeIdIndex, pVBInfo); 5131 5148 XGI_GetLVDSResInfo(ModeIdIndex, pVBInfo); 5132 5149 XGI_GetLVDSData(ModeIdIndex, pVBInfo); 5133 5150 XGI_ModCRT1Regs(ModeIdIndex, HwDeviceExtension, pVBInfo); ··· 5136 5153 } 5137 5154 5138 5155 static unsigned char XGI_SetCRT2Group301(unsigned short ModeNo, 5139 - struct xgi_hw_device_info *HwDeviceExtension, 5140 - struct vb_device_info *pVBInfo) 5156 + struct xgi_hw_device_info *HwDeviceExtension, 5157 + struct vb_device_info *pVBInfo) 5141 5158 { 5142 5159 unsigned short ModeIdIndex, RefreshRateTableIndex; 5143 5160 ··· 5145 5162 XGI_SearchModeID(ModeNo, &ModeIdIndex); 5146 5163 pVBInfo->SelectCRT2Rate = 4; 5147 5164 RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo, 5148 - ModeIdIndex, pVBInfo); 5165 + ModeIdIndex, pVBInfo); 5149 5166 XGI_SaveCRT2Info(ModeNo, pVBInfo); 5150 5167 XGI_GetCRT2ResInfo(ModeIdIndex, pVBInfo); 5151 5168 XGI_GetCRT2Data(ModeIdIndex, RefreshRateTableIndex, pVBInfo); ··· 5208 5225 5209 5226 for (i = 8; i < 11; i++) 5210 5227 xgifb_reg_set(pVBInfo->P3d4, (unsigned short)(i + 8), 5211 - CRTCData[i]); 5228 + CRTCData[i]); 5212 5229 5213 5230 for (i = 11; i < 13; i++) 5214 5231 xgifb_reg_set(pVBInfo->P3d4, (unsigned short)(i + 4), 5215 - CRTCData[i]); 5232 + CRTCData[i]); 5216 5233 5217 5234 for (i = 13; i < 16; i++) 5218 5235 xgifb_reg_set(pVBInfo->P3c4, (unsigned short)(i - 3), 5219 - CRTCData[i]); 5236 + CRTCData[i]); 5220 5237 5221 5238 xgifb_reg_set(pVBInfo->P3c4, 0x0E, (unsigned char)(CRTCData[16] 5222 - & 0xE0)); 5239 + & 0xE0)); 5223 5240 5224 5241 xgifb_reg_set(pVBInfo->P3c4, 0x31, 0x00); 5225 5242 xgifb_reg_set(pVBInfo->P3c4, 0x2B, 0x1B); ··· 5256 5273 } 5257 5274 5258 5275 static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info, 5259 - struct xgi_hw_device_info *HwDeviceExtension, 5260 - struct vb_device_info *pVBInfo) 5276 + struct xgi_hw_device_info *HwDeviceExtension, 5277 + struct vb_device_info *pVBInfo) 5261 5278 { 5262 5279 unsigned short tempah; 5263 5280 ··· 5287 5304 5288 5305 if (!(pVBInfo->VBInfo & DisableCRT2Display)) { 5289 5306 xgifb_reg_and_or(pVBInfo->Part2Port, 0x00, ~0xE0, 5290 - 0x20); /* shampoo 0129 */ 5307 + 0x20); /* shampoo 0129 */ 5291 5308 if (pVBInfo->VBType & (VB_SIS302LV | VB_XGI301C)) { 5292 5309 if (pVBInfo->VBInfo & 5293 5310 (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) 5294 - /* LVDS PLL power on */ 5311 + /* LVDS PLL power on */ 5295 5312 xgifb_reg_and(pVBInfo->Part4Port, 0x2A, 5296 5313 0x7F); 5297 5314 /* LVDS Driver power on */ ··· 5335 5352 } 5336 5353 5337 5354 static void XGI_SetCRT1Group(struct xgifb_video_info *xgifb_info, 5338 - struct xgi_hw_device_info *HwDeviceExtension, 5339 - unsigned short ModeNo, unsigned short ModeIdIndex, 5340 - struct vb_device_info *pVBInfo) 5355 + struct xgi_hw_device_info *HwDeviceExtension, 5356 + unsigned short ModeNo, unsigned short ModeIdIndex, 5357 + struct vb_device_info *pVBInfo) 5341 5358 { 5342 5359 unsigned short RefreshRateTableIndex, temp; 5343 5360 ··· 5366 5383 } 5367 5384 5368 5385 RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo, 5369 - ModeIdIndex, pVBInfo); 5386 + ModeIdIndex, pVBInfo); 5370 5387 if (RefreshRateTableIndex != 0xFFFF) { 5371 5388 XGI_SetSync(RefreshRateTableIndex, pVBInfo); 5372 5389 XGI_SetCRT1CRTC(ModeIdIndex, RefreshRateTableIndex, 5373 5390 pVBInfo, HwDeviceExtension); 5374 5391 XGI_SetCRT1DE(ModeIdIndex, RefreshRateTableIndex, pVBInfo); 5375 5392 XGI_SetCRT1Offset(ModeNo, ModeIdIndex, RefreshRateTableIndex, 5376 - HwDeviceExtension, pVBInfo); 5393 + HwDeviceExtension, pVBInfo); 5377 5394 XGI_SetCRT1VCLK(ModeIdIndex, HwDeviceExtension, 5378 5395 RefreshRateTableIndex, pVBInfo); 5379 5396 } ··· 5387 5404 XGI_SetXG21CRTC(RefreshRateTableIndex, pVBInfo); 5388 5405 5389 5406 XGI_UpdateXG21CRTC(ModeNo, pVBInfo, 5390 - RefreshRateTableIndex); 5407 + RefreshRateTableIndex); 5391 5408 5392 5409 xgifb_set_lcd(HwDeviceExtension->jChipType, 5393 5410 pVBInfo, RefreshRateTableIndex); 5394 5411 5395 5412 if (pVBInfo->IF_DEF_LVDS == 1) 5396 5413 xgifb_set_lvds(xgifb_info, 5397 - HwDeviceExtension->jChipType, 5398 - ModeIdIndex, pVBInfo); 5414 + HwDeviceExtension->jChipType, 5415 + ModeIdIndex, pVBInfo); 5399 5416 } 5400 5417 } 5401 5418 ··· 5407 5424 } 5408 5425 5409 5426 unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info, 5410 - struct xgi_hw_device_info *HwDeviceExtension, 5411 - unsigned short ModeNo) 5427 + struct xgi_hw_device_info *HwDeviceExtension, 5428 + unsigned short ModeNo) 5412 5429 { 5413 5430 unsigned short ModeIdIndex; 5414 5431 struct vb_device_info VBINF; ··· 5450 5467 XGI_DisableBridge(xgifb_info, HwDeviceExtension, pVBInfo); 5451 5468 5452 5469 if (pVBInfo->VBInfo & (SetSimuScanMode | XGI_SetCRT2ToLCDA) || 5453 - !(pVBInfo->VBInfo & SwitchCRT2)) { 5470 + !(pVBInfo->VBInfo & SwitchCRT2)) { 5454 5471 XGI_SetCRT1Group(xgifb_info, HwDeviceExtension, ModeNo, 5455 - ModeIdIndex, pVBInfo); 5472 + ModeIdIndex, pVBInfo); 5456 5473 5457 5474 if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) { 5458 5475 XGI_SetLCDAGroup(ModeNo, ModeIdIndex, 5459 - HwDeviceExtension, pVBInfo); 5476 + HwDeviceExtension, pVBInfo); 5460 5477 } 5461 5478 } 5462 5479 ··· 5465 5482 case VB_CHIP_301: /* fall through */ 5466 5483 case VB_CHIP_302: 5467 5484 XGI_SetCRT2Group301(ModeNo, HwDeviceExtension, 5468 - pVBInfo); /* add for CRT2 */ 5485 + pVBInfo); /* add for CRT2 */ 5469 5486 break; 5470 5487 5471 5488 default: ··· 5492 5509 XGI_DisplayOff(xgifb_info, HwDeviceExtension, pVBInfo); 5493 5510 5494 5511 XGI_SetCRT1Group(xgifb_info, HwDeviceExtension, ModeNo, 5495 - ModeIdIndex, pVBInfo); 5512 + ModeIdIndex, pVBInfo); 5496 5513 5497 5514 XGI_DisplayOn(xgifb_info, HwDeviceExtension, pVBInfo); 5498 5515 }