.. | .. |
---|
546 | 546 | ret = usb_submit_urb(oob_port->write_urb, GFP_ATOMIC); |
---|
547 | 547 | if (ret == 0) { |
---|
548 | 548 | oob_priv->dp_write_urb_in_use = 1; |
---|
549 | | - port_priv->dp_modem_signals = |
---|
550 | | - (port_priv->dp_modem_signals&~(TIOCM_DTR|TIOCM_RTS)) |
---|
551 | | - | (modem_signals&(TIOCM_DTR|TIOCM_RTS)); |
---|
| 549 | + port_priv->dp_modem_signals &= ~(TIOCM_DTR | TIOCM_RTS); |
---|
| 550 | + port_priv->dp_modem_signals |= |
---|
| 551 | + modem_signals & (TIOCM_DTR | TIOCM_RTS); |
---|
552 | 552 | } |
---|
553 | 553 | spin_unlock(&port_priv->dp_port_lock); |
---|
554 | 554 | spin_unlock_irqrestore(&oob_priv->dp_port_lock, flags); |
---|
.. | .. |
---|
717 | 717 | /* set parity */ |
---|
718 | 718 | tty->termios.c_cflag &= ~CMSPAR; |
---|
719 | 719 | |
---|
720 | | - if ((cflag&(PARENB|PARODD)) != (old_cflag&(PARENB|PARODD))) { |
---|
721 | | - if (cflag&PARENB) { |
---|
722 | | - if (cflag&PARODD) |
---|
| 720 | + if ((cflag & (PARENB | PARODD)) != (old_cflag & (PARENB | PARODD))) { |
---|
| 721 | + if (cflag & PARENB) { |
---|
| 722 | + if (cflag & PARODD) |
---|
723 | 723 | arg = DIGI_PARITY_ODD; |
---|
724 | 724 | else |
---|
725 | 725 | arg = DIGI_PARITY_EVEN; |
---|
.. | .. |
---|
732 | 732 | buf[i++] = 0; |
---|
733 | 733 | } |
---|
734 | 734 | /* set word size */ |
---|
735 | | - if ((cflag&CSIZE) != (old_cflag&CSIZE)) { |
---|
| 735 | + if ((cflag & CSIZE) != (old_cflag & CSIZE)) { |
---|
736 | 736 | arg = -1; |
---|
737 | | - switch (cflag&CSIZE) { |
---|
| 737 | + switch (cflag & CSIZE) { |
---|
738 | 738 | case CS5: arg = DIGI_WORD_SIZE_5; break; |
---|
739 | 739 | case CS6: arg = DIGI_WORD_SIZE_6; break; |
---|
740 | 740 | case CS7: arg = DIGI_WORD_SIZE_7; break; |
---|
.. | .. |
---|
742 | 742 | default: |
---|
743 | 743 | dev_dbg(dev, |
---|
744 | 744 | "digi_set_termios: can't handle word size %d\n", |
---|
745 | | - (cflag&CSIZE)); |
---|
| 745 | + cflag & CSIZE); |
---|
746 | 746 | break; |
---|
747 | 747 | } |
---|
748 | 748 | |
---|
.. | .. |
---|
756 | 756 | } |
---|
757 | 757 | |
---|
758 | 758 | /* set stop bits */ |
---|
759 | | - if ((cflag&CSTOPB) != (old_cflag&CSTOPB)) { |
---|
| 759 | + if ((cflag & CSTOPB) != (old_cflag & CSTOPB)) { |
---|
760 | 760 | |
---|
761 | | - if ((cflag&CSTOPB)) |
---|
| 761 | + if ((cflag & CSTOPB)) |
---|
762 | 762 | arg = DIGI_STOP_BITS_2; |
---|
763 | 763 | else |
---|
764 | 764 | arg = DIGI_STOP_BITS_1; |
---|
.. | .. |
---|
771 | 771 | } |
---|
772 | 772 | |
---|
773 | 773 | /* set input flow control */ |
---|
774 | | - if ((iflag&IXOFF) != (old_iflag&IXOFF) |
---|
775 | | - || (cflag&CRTSCTS) != (old_cflag&CRTSCTS)) { |
---|
| 774 | + if ((iflag & IXOFF) != (old_iflag & IXOFF) || |
---|
| 775 | + (cflag & CRTSCTS) != (old_cflag & CRTSCTS)) { |
---|
776 | 776 | arg = 0; |
---|
777 | | - if (iflag&IXOFF) |
---|
| 777 | + if (iflag & IXOFF) |
---|
778 | 778 | arg |= DIGI_INPUT_FLOW_CONTROL_XON_XOFF; |
---|
779 | 779 | else |
---|
780 | 780 | arg &= ~DIGI_INPUT_FLOW_CONTROL_XON_XOFF; |
---|
781 | 781 | |
---|
782 | | - if (cflag&CRTSCTS) { |
---|
| 782 | + if (cflag & CRTSCTS) { |
---|
783 | 783 | arg |= DIGI_INPUT_FLOW_CONTROL_RTS; |
---|
784 | 784 | |
---|
785 | 785 | /* On USB-4 it is necessary to assert RTS prior */ |
---|
.. | .. |
---|
799 | 799 | } |
---|
800 | 800 | |
---|
801 | 801 | /* set output flow control */ |
---|
802 | | - if ((iflag & IXON) != (old_iflag & IXON) |
---|
803 | | - || (cflag & CRTSCTS) != (old_cflag & CRTSCTS)) { |
---|
| 802 | + if ((iflag & IXON) != (old_iflag & IXON) || |
---|
| 803 | + (cflag & CRTSCTS) != (old_cflag & CRTSCTS)) { |
---|
804 | 804 | arg = 0; |
---|
805 | 805 | if (iflag & IXON) |
---|
806 | 806 | arg |= DIGI_OUTPUT_FLOW_CONTROL_XON_XOFF; |
---|
807 | 807 | else |
---|
808 | 808 | arg &= ~DIGI_OUTPUT_FLOW_CONTROL_XON_XOFF; |
---|
809 | 809 | |
---|
810 | | - if (cflag & CRTSCTS) { |
---|
| 810 | + if (cflag & CRTSCTS) |
---|
811 | 811 | arg |= DIGI_OUTPUT_FLOW_CONTROL_CTS; |
---|
812 | | - } else { |
---|
| 812 | + else |
---|
813 | 813 | arg &= ~DIGI_OUTPUT_FLOW_CONTROL_CTS; |
---|
814 | | - } |
---|
815 | 814 | |
---|
816 | 815 | buf[i++] = DIGI_CMD_SET_OUTPUT_FLOW_CONTROL; |
---|
817 | 816 | buf[i++] = priv->dp_port_num; |
---|
.. | .. |
---|
1062 | 1061 | static void digi_dtr_rts(struct usb_serial_port *port, int on) |
---|
1063 | 1062 | { |
---|
1064 | 1063 | /* Adjust DTR and RTS */ |
---|
1065 | | - digi_set_modem_signals(port, on * (TIOCM_DTR|TIOCM_RTS), 1); |
---|
| 1064 | + digi_set_modem_signals(port, on * (TIOCM_DTR | TIOCM_RTS), 1); |
---|
1066 | 1065 | } |
---|
1067 | 1066 | |
---|
1068 | 1067 | static int digi_open(struct tty_struct *tty, struct usb_serial_port *port) |
---|
.. | .. |
---|
1450 | 1449 | struct usb_serial_port *port = urb->context; |
---|
1451 | 1450 | struct usb_serial *serial = port->serial; |
---|
1452 | 1451 | struct tty_struct *tty; |
---|
1453 | | - struct digi_port *priv = usb_get_serial_port_data(port); |
---|
| 1452 | + struct digi_port *priv; |
---|
1454 | 1453 | unsigned char *buf = urb->transfer_buffer; |
---|
1455 | 1454 | int opcode, line, status, val; |
---|
1456 | 1455 | unsigned long flags; |
---|