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

USB: serial: digi_acceleport: clean up set_termios

Clean up set_termios() by adding missing white space around operators
and making a couple of continuation lines more readable.

Also drop a couple of redundant braces.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>

Johan Hovold 74d81395 a7f9f290

+16 -17
+16 -17
drivers/usb/serial/digi_acceleport.c
··· 740 740 /* set parity */ 741 741 tty->termios.c_cflag &= ~CMSPAR; 742 742 743 - if ((cflag&(PARENB|PARODD)) != (old_cflag&(PARENB|PARODD))) { 744 - if (cflag&PARENB) { 745 - if (cflag&PARODD) 743 + if ((cflag & (PARENB | PARODD)) != (old_cflag & (PARENB | PARODD))) { 744 + if (cflag & PARENB) { 745 + if (cflag & PARODD) 746 746 arg = DIGI_PARITY_ODD; 747 747 else 748 748 arg = DIGI_PARITY_EVEN; ··· 755 755 buf[i++] = 0; 756 756 } 757 757 /* set word size */ 758 - if ((cflag&CSIZE) != (old_cflag&CSIZE)) { 758 + if ((cflag & CSIZE) != (old_cflag & CSIZE)) { 759 759 arg = -1; 760 - switch (cflag&CSIZE) { 760 + switch (cflag & CSIZE) { 761 761 case CS5: arg = DIGI_WORD_SIZE_5; break; 762 762 case CS6: arg = DIGI_WORD_SIZE_6; break; 763 763 case CS7: arg = DIGI_WORD_SIZE_7; break; ··· 765 765 default: 766 766 dev_dbg(dev, 767 767 "digi_set_termios: can't handle word size %d\n", 768 - (cflag&CSIZE)); 768 + cflag & CSIZE); 769 769 break; 770 770 } 771 771 ··· 779 779 } 780 780 781 781 /* set stop bits */ 782 - if ((cflag&CSTOPB) != (old_cflag&CSTOPB)) { 782 + if ((cflag & CSTOPB) != (old_cflag & CSTOPB)) { 783 783 784 - if ((cflag&CSTOPB)) 784 + if ((cflag & CSTOPB)) 785 785 arg = DIGI_STOP_BITS_2; 786 786 else 787 787 arg = DIGI_STOP_BITS_1; ··· 794 794 } 795 795 796 796 /* set input flow control */ 797 - if ((iflag&IXOFF) != (old_iflag&IXOFF) 798 - || (cflag&CRTSCTS) != (old_cflag&CRTSCTS)) { 797 + if ((iflag & IXOFF) != (old_iflag & IXOFF) || 798 + (cflag & CRTSCTS) != (old_cflag & CRTSCTS)) { 799 799 arg = 0; 800 - if (iflag&IXOFF) 800 + if (iflag & IXOFF) 801 801 arg |= DIGI_INPUT_FLOW_CONTROL_XON_XOFF; 802 802 else 803 803 arg &= ~DIGI_INPUT_FLOW_CONTROL_XON_XOFF; 804 804 805 - if (cflag&CRTSCTS) { 805 + if (cflag & CRTSCTS) { 806 806 arg |= DIGI_INPUT_FLOW_CONTROL_RTS; 807 807 808 808 /* On USB-4 it is necessary to assert RTS prior */ ··· 822 822 } 823 823 824 824 /* set output flow control */ 825 - if ((iflag & IXON) != (old_iflag & IXON) 826 - || (cflag & CRTSCTS) != (old_cflag & CRTSCTS)) { 825 + if ((iflag & IXON) != (old_iflag & IXON) || 826 + (cflag & CRTSCTS) != (old_cflag & CRTSCTS)) { 827 827 arg = 0; 828 828 if (iflag & IXON) 829 829 arg |= DIGI_OUTPUT_FLOW_CONTROL_XON_XOFF; 830 830 else 831 831 arg &= ~DIGI_OUTPUT_FLOW_CONTROL_XON_XOFF; 832 832 833 - if (cflag & CRTSCTS) { 833 + if (cflag & CRTSCTS) 834 834 arg |= DIGI_OUTPUT_FLOW_CONTROL_CTS; 835 - } else { 835 + else 836 836 arg &= ~DIGI_OUTPUT_FLOW_CONTROL_CTS; 837 - } 838 837 839 838 buf[i++] = DIGI_CMD_SET_OUTPUT_FLOW_CONTROL; 840 839 buf[i++] = priv->dp_port_num;