Commit 2b982ab1 authored by Ben Minerds's avatar Ben Minerds Committed by Greg Kroah-Hartman

USB: serial: keyspan: Fix spacing around conditional.

Changes to conform with checkpatch.sh script. - spaces around '?' and
':'.  Removed 14 checkpatch.sh errors.
Signed-off-by: default avatarBen Minerds <puzzleduck@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6470cbc4
...@@ -176,7 +176,7 @@ static void keyspan_set_termios(struct tty_struct *tty, ...@@ -176,7 +176,7 @@ static void keyspan_set_termios(struct tty_struct *tty,
tty_encode_baud_rate(tty, baud_rate, baud_rate); tty_encode_baud_rate(tty, baud_rate, baud_rate);
/* set CTS/RTS handshake etc. */ /* set CTS/RTS handshake etc. */
p_priv->cflag = cflag; p_priv->cflag = cflag;
p_priv->flow_control = (cflag & CRTSCTS)? flow_cts: flow_none; p_priv->flow_control = (cflag & CRTSCTS) ? flow_cts : flow_none;
/* Mark/Space not supported */ /* Mark/Space not supported */
tty->termios->c_cflag &= ~CMSPAR; tty->termios->c_cflag &= ~CMSPAR;
...@@ -1099,7 +1099,7 @@ static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -1099,7 +1099,7 @@ static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port)
} }
/* set CTS/RTS handshake etc. */ /* set CTS/RTS handshake etc. */
p_priv->cflag = cflag; p_priv->cflag = cflag;
p_priv->flow_control = (cflag & CRTSCTS)? flow_cts: flow_none; p_priv->flow_control = (cflag & CRTSCTS) ? flow_cts : flow_none;
keyspan_send_setup(port, 1); keyspan_send_setup(port, 1);
/* mdelay(100); */ /* mdelay(100); */
...@@ -1704,7 +1704,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial, ...@@ -1704,7 +1704,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial,
msg.setPrescaler = 0xff; msg.setPrescaler = 0xff;
} }
msg.lcr = (p_priv->cflag & CSTOPB)? STOPBITS_678_2: STOPBITS_5678_1; msg.lcr = (p_priv->cflag & CSTOPB) ? STOPBITS_678_2 : STOPBITS_5678_1;
switch (p_priv->cflag & CSIZE) { switch (p_priv->cflag & CSIZE) {
case CS5: case CS5:
msg.lcr |= USA_DATABITS_5; msg.lcr |= USA_DATABITS_5;
...@@ -1721,7 +1721,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial, ...@@ -1721,7 +1721,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial,
} }
if (p_priv->cflag & PARENB) { if (p_priv->cflag & PARENB) {
/* note USA_PARITY_NONE == 0 */ /* note USA_PARITY_NONE == 0 */
msg.lcr |= (p_priv->cflag & PARODD)? msg.lcr |= (p_priv->cflag & PARODD) ?
USA_PARITY_ODD : USA_PARITY_EVEN; USA_PARITY_ODD : USA_PARITY_EVEN;
} }
msg.setLcr = 0xff; msg.setLcr = 0xff;
...@@ -1989,7 +1989,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial, ...@@ -1989,7 +1989,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial,
/* msg.setPrescaler = 0xff; */ /* msg.setPrescaler = 0xff; */
} }
msg.lcr = (p_priv->cflag & CSTOPB)? STOPBITS_678_2: STOPBITS_5678_1; msg.lcr = (p_priv->cflag & CSTOPB) ? STOPBITS_678_2 : STOPBITS_5678_1;
switch (p_priv->cflag & CSIZE) { switch (p_priv->cflag & CSIZE) {
case CS5: case CS5:
msg.lcr |= USA_DATABITS_5; msg.lcr |= USA_DATABITS_5;
...@@ -2006,7 +2006,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial, ...@@ -2006,7 +2006,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial,
} }
if (p_priv->cflag & PARENB) { if (p_priv->cflag & PARENB) {
/* note USA_PARITY_NONE == 0 */ /* note USA_PARITY_NONE == 0 */
msg.lcr |= (p_priv->cflag & PARODD)? msg.lcr |= (p_priv->cflag & PARODD) ?
USA_PARITY_ODD : USA_PARITY_EVEN; USA_PARITY_ODD : USA_PARITY_EVEN;
} }
msg.setLcr = 0xff; msg.setLcr = 0xff;
...@@ -2173,7 +2173,7 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial, ...@@ -2173,7 +2173,7 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial,
msg.txMode = TXMODE_BYHAND; msg.txMode = TXMODE_BYHAND;
} }
msg.lcr = (p_priv->cflag & CSTOPB)? STOPBITS_678_2: STOPBITS_5678_1; msg.lcr = (p_priv->cflag & CSTOPB) ? STOPBITS_678_2 : STOPBITS_5678_1;
switch (p_priv->cflag & CSIZE) { switch (p_priv->cflag & CSIZE) {
case CS5: case CS5:
msg.lcr |= USA_DATABITS_5; msg.lcr |= USA_DATABITS_5;
...@@ -2190,7 +2190,7 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial, ...@@ -2190,7 +2190,7 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial,
} }
if (p_priv->cflag & PARENB) { if (p_priv->cflag & PARENB) {
/* note USA_PARITY_NONE == 0 */ /* note USA_PARITY_NONE == 0 */
msg.lcr |= (p_priv->cflag & PARODD)? msg.lcr |= (p_priv->cflag & PARODD) ?
USA_PARITY_ODD : USA_PARITY_EVEN; USA_PARITY_ODD : USA_PARITY_EVEN;
} }
if (p_priv->old_cflag != p_priv->cflag) { if (p_priv->old_cflag != p_priv->cflag) {
...@@ -2317,7 +2317,7 @@ static int keyspan_usa67_send_setup(struct usb_serial *serial, ...@@ -2317,7 +2317,7 @@ static int keyspan_usa67_send_setup(struct usb_serial *serial,
} }
if (p_priv->cflag & PARENB) { if (p_priv->cflag & PARENB) {
/* note USA_PARITY_NONE == 0 */ /* note USA_PARITY_NONE == 0 */
msg.lcr |= (p_priv->cflag & PARODD)? msg.lcr |= (p_priv->cflag & PARODD) ?
USA_PARITY_ODD : USA_PARITY_EVEN; USA_PARITY_ODD : USA_PARITY_EVEN;
} }
msg.setLcr = 0xff; msg.setLcr = 0xff;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment