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

Merge master.kernel.org:/home/rmk/linux-2.6-serial

Linus Torvalds b3e112bc f647a274

+20 -20
unified split
+5 -5
drivers/serial/8250.c
··· 1682 1683 switch (termios->c_cflag & CSIZE) { 1684 case CS5: 1685 - cval = 0x00; 1686 break; 1687 case CS6: 1688 - cval = 0x01; 1689 break; 1690 case CS7: 1691 - cval = 0x02; 1692 break; 1693 default: 1694 case CS8: 1695 - cval = 0x03; 1696 break; 1697 } 1698 1699 if (termios->c_cflag & CSTOPB) 1700 - cval |= 0x04; 1701 if (termios->c_cflag & PARENB) 1702 cval |= UART_LCR_PARITY; 1703 if (!(termios->c_cflag & PARODD))
··· 1682 1683 switch (termios->c_cflag & CSIZE) { 1684 case CS5: 1685 + cval = UART_LCR_WLEN5; 1686 break; 1687 case CS6: 1688 + cval = UART_LCR_WLEN6; 1689 break; 1690 case CS7: 1691 + cval = UART_LCR_WLEN7; 1692 break; 1693 default: 1694 case CS8: 1695 + cval = UART_LCR_WLEN8; 1696 break; 1697 } 1698 1699 if (termios->c_cflag & CSTOPB) 1700 + cval |= UART_LCR_STOP; 1701 if (termios->c_cflag & PARENB) 1702 cval |= UART_LCR_PARITY; 1703 if (!(termios->c_cflag & PARODD))
+5 -5
drivers/serial/au1x00_uart.c
··· 773 774 switch (termios->c_cflag & CSIZE) { 775 case CS5: 776 - cval = 0x00; 777 break; 778 case CS6: 779 - cval = 0x01; 780 break; 781 case CS7: 782 - cval = 0x02; 783 break; 784 default: 785 case CS8: 786 - cval = 0x03; 787 break; 788 } 789 790 if (termios->c_cflag & CSTOPB) 791 - cval |= 0x04; 792 if (termios->c_cflag & PARENB) 793 cval |= UART_LCR_PARITY; 794 if (!(termios->c_cflag & PARODD))
··· 773 774 switch (termios->c_cflag & CSIZE) { 775 case CS5: 776 + cval = UART_LCR_WLEN5; 777 break; 778 case CS6: 779 + cval = UART_LCR_WLEN6; 780 break; 781 case CS7: 782 + cval = UART_LCR_WLEN7; 783 break; 784 default: 785 case CS8: 786 + cval = UART_LCR_WLEN8; 787 break; 788 } 789 790 if (termios->c_cflag & CSTOPB) 791 + cval |= UART_LCR_STOP; 792 if (termios->c_cflag & PARENB) 793 cval |= UART_LCR_PARITY; 794 if (!(termios->c_cflag & PARODD))
+5 -5
drivers/serial/m32r_sio.c
··· 724 725 switch (termios->c_cflag & CSIZE) { 726 case CS5: 727 - cval = 0x00; 728 break; 729 case CS6: 730 - cval = 0x01; 731 break; 732 case CS7: 733 - cval = 0x02; 734 break; 735 default: 736 case CS8: 737 - cval = 0x03; 738 break; 739 } 740 741 if (termios->c_cflag & CSTOPB) 742 - cval |= 0x04; 743 if (termios->c_cflag & PARENB) 744 cval |= UART_LCR_PARITY; 745 if (!(termios->c_cflag & PARODD))
··· 724 725 switch (termios->c_cflag & CSIZE) { 726 case CS5: 727 + cval = UART_LCR_WLEN5; 728 break; 729 case CS6: 730 + cval = UART_LCR_WLEN6; 731 break; 732 case CS7: 733 + cval = UART_LCR_WLEN7; 734 break; 735 default: 736 case CS8: 737 + cval = UART_LCR_WLEN8; 738 break; 739 } 740 741 if (termios->c_cflag & CSTOPB) 742 + cval |= UART_LCR_STOP; 743 if (termios->c_cflag & PARENB) 744 cval |= UART_LCR_PARITY; 745 if (!(termios->c_cflag & PARODD))
+5 -5
drivers/serial/pxa.c
··· 455 456 switch (termios->c_cflag & CSIZE) { 457 case CS5: 458 - cval = 0x00; 459 break; 460 case CS6: 461 - cval = 0x01; 462 break; 463 case CS7: 464 - cval = 0x02; 465 break; 466 default: 467 case CS8: 468 - cval = 0x03; 469 break; 470 } 471 472 if (termios->c_cflag & CSTOPB) 473 - cval |= 0x04; 474 if (termios->c_cflag & PARENB) 475 cval |= UART_LCR_PARITY; 476 if (!(termios->c_cflag & PARODD))
··· 455 456 switch (termios->c_cflag & CSIZE) { 457 case CS5: 458 + cval = UART_LCR_WLEN5; 459 break; 460 case CS6: 461 + cval = UART_LCR_WLEN6; 462 break; 463 case CS7: 464 + cval = UART_LCR_WLEN7; 465 break; 466 default: 467 case CS8: 468 + cval = UART_LCR_WLEN8; 469 break; 470 } 471 472 if (termios->c_cflag & CSTOPB) 473 + cval |= UART_LCR_STOP; 474 if (termios->c_cflag & PARENB) 475 cval |= UART_LCR_PARITY; 476 if (!(termios->c_cflag & PARODD))