USB: serial: digi_acceleport: clean up modem-control handling

Clean up modem-control handling somewhat by adding missing whitespace
around operators and splitting a long statement in two.

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

diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index e7f244cf2c0723db4d8cedb00a0ac4fd544d52f4..4699e114f6174dac554340a6a63446f00159e899 100644 (file)
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -569,9 +569,9 @@ static int digi_set_modem_signals(struct usb_serial_port *port,
        ret = usb_submit_urb(oob_port->write_urb, GFP_ATOMIC);
        if (ret == 0) {
                oob_priv->dp_write_urb_in_use = 1;
-               port_priv->dp_modem_signals =
-                       (port_priv->dp_modem_signals&~(TIOCM_DTR|TIOCM_RTS))
-                       | (modem_signals&(TIOCM_DTR|TIOCM_RTS));
+               port_priv->dp_modem_signals &= ~(TIOCM_DTR | TIOCM_RTS);
+               port_priv->dp_modem_signals |=
+                               modem_signals & (TIOCM_DTR | TIOCM_RTS);
        }
        spin_unlock(&port_priv->dp_port_lock);
        spin_unlock_irqrestore(&oob_priv->dp_port_lock, flags);
@@ -1084,7 +1084,7 @@ static int digi_chars_in_buffer(struct tty_struct *tty)
 static void digi_dtr_rts(struct usb_serial_port *port, int on)
 {
        /* Adjust DTR and RTS */
-       digi_set_modem_signals(port, on * (TIOCM_DTR|TIOCM_RTS), 1);
+       digi_set_modem_signals(port, on * (TIOCM_DTR | TIOCM_RTS), 1);
 }
 
 static int digi_open(struct tty_struct *tty, struct usb_serial_port *port)