aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorBen Minerds <puzzleduck@gmail.com>2012-07-11 10:10:16 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 20:06:07 -0400
commit2b982ab177b1698abfde05e3c04d958a65283d63 (patch)
tree10d903153c2013a8e776b1c68d61a77d8d4cdcf9 /drivers/usb/serial
parent6470cbc486652942dcf6c4b6420e3a521e766bbf (diff)
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: Ben Minerds <puzzleduck@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/keyspan.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 9a0ca8355905..7f1a04582183 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -176,7 +176,7 @@ static void keyspan_set_termios(struct tty_struct *tty,
176 tty_encode_baud_rate(tty, baud_rate, baud_rate); 176 tty_encode_baud_rate(tty, baud_rate, baud_rate);
177 /* set CTS/RTS handshake etc. */ 177 /* set CTS/RTS handshake etc. */
178 p_priv->cflag = cflag; 178 p_priv->cflag = cflag;
179 p_priv->flow_control = (cflag & CRTSCTS)? flow_cts: flow_none; 179 p_priv->flow_control = (cflag & CRTSCTS) ? flow_cts : flow_none;
180 180
181 /* Mark/Space not supported */ 181 /* Mark/Space not supported */
182 tty->termios->c_cflag &= ~CMSPAR; 182 tty->termios->c_cflag &= ~CMSPAR;
@@ -1099,7 +1099,7 @@ static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port)
1099 } 1099 }
1100 /* set CTS/RTS handshake etc. */ 1100 /* set CTS/RTS handshake etc. */
1101 p_priv->cflag = cflag; 1101 p_priv->cflag = cflag;
1102 p_priv->flow_control = (cflag & CRTSCTS)? flow_cts: flow_none; 1102 p_priv->flow_control = (cflag & CRTSCTS) ? flow_cts : flow_none;
1103 1103
1104 keyspan_send_setup(port, 1); 1104 keyspan_send_setup(port, 1);
1105 /* mdelay(100); */ 1105 /* mdelay(100); */
@@ -1704,7 +1704,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial,
1704 msg.setPrescaler = 0xff; 1704 msg.setPrescaler = 0xff;
1705 } 1705 }
1706 1706
1707 msg.lcr = (p_priv->cflag & CSTOPB)? STOPBITS_678_2: STOPBITS_5678_1; 1707 msg.lcr = (p_priv->cflag & CSTOPB) ? STOPBITS_678_2 : STOPBITS_5678_1;
1708 switch (p_priv->cflag & CSIZE) { 1708 switch (p_priv->cflag & CSIZE) {
1709 case CS5: 1709 case CS5:
1710 msg.lcr |= USA_DATABITS_5; 1710 msg.lcr |= USA_DATABITS_5;
@@ -1721,7 +1721,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial,
1721 } 1721 }
1722 if (p_priv->cflag & PARENB) { 1722 if (p_priv->cflag & PARENB) {
1723 /* note USA_PARITY_NONE == 0 */ 1723 /* note USA_PARITY_NONE == 0 */
1724 msg.lcr |= (p_priv->cflag & PARODD)? 1724 msg.lcr |= (p_priv->cflag & PARODD) ?
1725 USA_PARITY_ODD : USA_PARITY_EVEN; 1725 USA_PARITY_ODD : USA_PARITY_EVEN;
1726 } 1726 }
1727 msg.setLcr = 0xff; 1727 msg.setLcr = 0xff;
@@ -1989,7 +1989,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial,
1989 /* msg.setPrescaler = 0xff; */ 1989 /* msg.setPrescaler = 0xff; */
1990 } 1990 }
1991 1991
1992 msg.lcr = (p_priv->cflag & CSTOPB)? STOPBITS_678_2: STOPBITS_5678_1; 1992 msg.lcr = (p_priv->cflag & CSTOPB) ? STOPBITS_678_2 : STOPBITS_5678_1;
1993 switch (p_priv->cflag & CSIZE) { 1993 switch (p_priv->cflag & CSIZE) {
1994 case CS5: 1994 case CS5:
1995 msg.lcr |= USA_DATABITS_5; 1995 msg.lcr |= USA_DATABITS_5;
@@ -2006,7 +2006,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial,
2006 } 2006 }
2007 if (p_priv->cflag & PARENB) { 2007 if (p_priv->cflag & PARENB) {
2008 /* note USA_PARITY_NONE == 0 */ 2008 /* note USA_PARITY_NONE == 0 */
2009 msg.lcr |= (p_priv->cflag & PARODD)? 2009 msg.lcr |= (p_priv->cflag & PARODD) ?
2010 USA_PARITY_ODD : USA_PARITY_EVEN; 2010 USA_PARITY_ODD : USA_PARITY_EVEN;
2011 } 2011 }
2012 msg.setLcr = 0xff; 2012 msg.setLcr = 0xff;
@@ -2173,7 +2173,7 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial,
2173 msg.txMode = TXMODE_BYHAND; 2173 msg.txMode = TXMODE_BYHAND;
2174 } 2174 }
2175 2175
2176 msg.lcr = (p_priv->cflag & CSTOPB)? STOPBITS_678_2: STOPBITS_5678_1; 2176 msg.lcr = (p_priv->cflag & CSTOPB) ? STOPBITS_678_2 : STOPBITS_5678_1;
2177 switch (p_priv->cflag & CSIZE) { 2177 switch (p_priv->cflag & CSIZE) {
2178 case CS5: 2178 case CS5:
2179 msg.lcr |= USA_DATABITS_5; 2179 msg.lcr |= USA_DATABITS_5;
@@ -2190,7 +2190,7 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial,
2190 } 2190 }
2191 if (p_priv->cflag & PARENB) { 2191 if (p_priv->cflag & PARENB) {
2192 /* note USA_PARITY_NONE == 0 */ 2192 /* note USA_PARITY_NONE == 0 */
2193 msg.lcr |= (p_priv->cflag & PARODD)? 2193 msg.lcr |= (p_priv->cflag & PARODD) ?
2194 USA_PARITY_ODD : USA_PARITY_EVEN; 2194 USA_PARITY_ODD : USA_PARITY_EVEN;
2195 } 2195 }
2196 if (p_priv->old_cflag != p_priv->cflag) { 2196 if (p_priv->old_cflag != p_priv->cflag) {
@@ -2317,7 +2317,7 @@ static int keyspan_usa67_send_setup(struct usb_serial *serial,
2317 } 2317 }
2318 if (p_priv->cflag & PARENB) { 2318 if (p_priv->cflag & PARENB) {
2319 /* note USA_PARITY_NONE == 0 */ 2319 /* note USA_PARITY_NONE == 0 */
2320 msg.lcr |= (p_priv->cflag & PARODD)? 2320 msg.lcr |= (p_priv->cflag & PARODD) ?
2321 USA_PARITY_ODD : USA_PARITY_EVEN; 2321 USA_PARITY_ODD : USA_PARITY_EVEN;
2322 } 2322 }
2323 msg.setLcr = 0xff; 2323 msg.setLcr = 0xff;