TTY: synclink: Convert + to | for bit operations

Dan Carpenter noticed a missing set of parentheses
around a multiple field addition.

https://lkml.org/lkml/2013/1/27/166

His original commit message:

There is a kind of precedence problem here, but it doesn't affect how
the code works because ->serial_signals is unsigned char.  We want to
clear two flags here.

#define SerialSignal_RTS            0x20     /* Request to Send */
#define SerialSignal_DTR            0x80     /* Data Terminal Ready */

Without the parenthesis then it does:

	info->serial_signals &= 0x5f;

With the parenthesis it does:

	info->serial_signals &= 0xffffff5f;

info->serial_signals is an unsigned char so the two statements are
equivalent, but it's cleaner to add the parenthesis.  In other dtr_rts()
functions the parenthesis are there so this makes it more consistent.

Other changes:

Convert all + uses to | for these bit operations.

Reorder the multiple fields for consistency.
Update the comments too.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 34e52ed0ea8c..d0c9852ab875 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -1343,7 +1343,7 @@ static void shutdown(MGSLPC_INFO * info, struct tty_struct *tty)
         reset_device(info);
 
         if (!tty || tty->termios.c_cflag & HUPCL) {
-                info->serial_signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
+                info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
                 set_signals(info);
         }
 
@@ -1405,12 +1405,12 @@ static void mgslpc_change_params(MGSLPC_INFO *info, struct tty_struct *tty)
 
         cflag = tty->termios.c_cflag;
 
-        /* if B0 rate (hangup) specified then negate DTR and RTS */
-        /* otherwise assert DTR and RTS */
+        /* if B0 rate (hangup) specified then negate RTS and DTR */
+        /* otherwise assert RTS and DTR */
         if (cflag & CBAUD)
-                info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;
+                info->serial_signals |= SerialSignal_RTS | SerialSignal_DTR;
         else
-                info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
+                info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
 
         /* byte size and parity */
 
@@ -2301,7 +2301,7 @@ static void mgslpc_set_termios(struct tty_struct *tty, struct ktermios *old_term
         /* Handle transition to B0 status */
         if (old_termios->c_cflag & CBAUD &&
             !(tty->termios.c_cflag & CBAUD)) {
-                info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
+                info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
                 spin_lock_irqsave(&info->lock,flags);
                 set_signals(info);
                 spin_unlock_irqrestore(&info->lock,flags);
@@ -2464,9 +2464,9 @@ static void dtr_rts(struct tty_port *port, int onoff)
 
         spin_lock_irqsave(&info->lock,flags);
         if (onoff)
-                info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;
+                info->serial_signals |= SerialSignal_RTS | SerialSignal_DTR;
         else
-                info->serial_signals &= ~SerialSignal_RTS + SerialSignal_DTR;
+                info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
         set_signals(info);
         spin_unlock_irqrestore(&info->lock,flags);
 }
@@ -3575,8 +3575,8 @@ static void get_signals(MGSLPC_INFO *info)
 {
         unsigned char status = 0;
 
-        /* preserve DTR and RTS */
-        info->serial_signals &= SerialSignal_DTR + SerialSignal_RTS;
+        /* preserve RTS and DTR */
+        info->serial_signals &= SerialSignal_RTS | SerialSignal_DTR;
 
         if (read_reg(info, CHB + VSTR) & BIT7)
                 info->serial_signals |= SerialSignal_DCD;
@@ -3590,7 +3590,7 @@ static void get_signals(MGSLPC_INFO *info)
                 info->serial_signals |= SerialSignal_DSR;
 }
 
-/* Set the state of DTR and RTS based on contents of
+/* Set the state of RTS and DTR based on contents of
  * serial_signals member of device extension.
  */
 static void set_signals(MGSLPC_INFO *info)
@@ -4009,8 +4009,8 @@ static int hdlcdev_open(struct net_device *dev)
                 spin_unlock_irqrestore(&info->netlock, flags);
                 return rc;
         }
-        /* assert DTR and RTS, apply hardware settings */
-        info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;
+        /* assert RTS and DTR, apply hardware settings */
+        info->serial_signals |= SerialSignal_RTS | SerialSignal_DTR;
         mgslpc_program_hw(info, tty);
         tty_kref_put(tty);