Merge tty-next into 3.6-rc1

This handles the merge issue in:
	arch/um/drivers/line.c
	arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 13 insertions, 18 deletions

diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 6225199119c0..7bcbb47e1449 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,
         tty_encode_baud_rate(tty, baud_rate, baud_rate);
         /* set CTS/RTS handshake etc. */
         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 */
         tty->termios.c_cflag &= ~CMSPAR;
@@ -474,7 +474,7 @@ static void usa28_indat_callback(struct urb *urb)
                 p_priv = usb_get_serial_port_data(port);
                 data = urb->transfer_buffer;
 
-                tty =tty_port_tty_get(&port->port);
+                tty = tty_port_tty_get(&port->port);
                 if (tty && urb->actual_length) {
                         tty_insert_flip_string(tty, data, urb->actual_length);
                         tty_flip_buffer_push(tty);
@@ -557,9 +557,9 @@ static void	usa28_instat_callback(struct urb *urb)
         p_priv->dcd_state = ((msg->dcd) ? 1 : 0);
         p_priv->ri_state = ((msg->ri) ? 1 : 0);
 
-        if( old_dcd_state != p_priv->dcd_state && old_dcd_state) {
+        if (old_dcd_state != p_priv->dcd_state && old_dcd_state) {
                 tty = tty_port_tty_get(&port->port);
-                if (tty && !C_CLOCAL(tty)) 
+                if (tty && !C_CLOCAL(tty))
                         tty_hangup(tty);
                 tty_kref_put(tty);
         }
@@ -1036,15 +1036,12 @@ static int keyspan_write_room(struct tty_struct *tty)
 static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
         struct keyspan_port_private     *p_priv;
-        struct keyspan_serial_private   *s_priv;
-        struct usb_serial               *serial = port->serial;
         const struct keyspan_device_details     *d_details;
         int                             i, err;
         int                             baud_rate, device_port;
         struct urb                      *urb;
         unsigned int                    cflag = 0;
 
-        s_priv = usb_get_serial_data(serial);
         p_priv = usb_get_serial_port_data(port);
         d_details = p_priv->device_details;
 
@@ -1102,7 +1099,7 @@ static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port)
         }
         /* set CTS/RTS handshake etc. */
         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);
         /* mdelay(100); */
@@ -1130,10 +1127,8 @@ static void keyspan_close(struct usb_serial_port *port)
 {
         int                     i;
         struct usb_serial       *serial = port->serial;
-        struct keyspan_serial_private   *s_priv;
         struct keyspan_port_private     *p_priv;
 
-        s_priv = usb_get_serial_data(serial);
         p_priv = usb_get_serial_port_data(port);
 
         p_priv->rts_state = 0;
@@ -1240,7 +1235,7 @@ static int keyspan_fake_startup(struct usb_serial *serial)
 
         if (request_ihex_firmware(&fw, fw_name, &serial->dev->dev)) {
                 dev_err(&serial->dev->dev, "Required keyspan firmware image (%s) unavailable.\n", fw_name);
-                return(1);
+                return 1;
         }
 
         dbg("Uploading Keyspan %s firmware.", fw_name);
@@ -1709,7 +1704,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial,
                 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) {
         case CS5:
                 msg.lcr |= USA_DATABITS_5;
@@ -1726,7 +1721,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial,
         }
         if (p_priv->cflag & PARENB) {
                 /* note USA_PARITY_NONE == 0 */
-                msg.lcr |= (p_priv->cflag & PARODD)?
+                msg.lcr |= (p_priv->cflag & PARODD) ?
                         USA_PARITY_ODD : USA_PARITY_EVEN;
         }
         msg.setLcr = 0xff;
@@ -1994,7 +1989,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial,
                 /* 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) {
         case CS5:
                 msg.lcr |= USA_DATABITS_5;
@@ -2011,7 +2006,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial,
         }
         if (p_priv->cflag & PARENB) {
                 /* note USA_PARITY_NONE == 0 */
-                msg.lcr |= (p_priv->cflag & PARODD)?
+                msg.lcr |= (p_priv->cflag & PARODD) ?
                         USA_PARITY_ODD : USA_PARITY_EVEN;
         }
         msg.setLcr = 0xff;
@@ -2178,7 +2173,7 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial,
                 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) {
         case CS5:
                 msg.lcr |= USA_DATABITS_5;
@@ -2195,7 +2190,7 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial,
         }
         if (p_priv->cflag & PARENB) {
                 /* note USA_PARITY_NONE == 0 */
-                msg.lcr |= (p_priv->cflag & PARODD)?
+                msg.lcr |= (p_priv->cflag & PARODD) ?
                         USA_PARITY_ODD : USA_PARITY_EVEN;
         }
         if (p_priv->old_cflag != p_priv->cflag) {
@@ -2322,7 +2317,7 @@ static int keyspan_usa67_send_setup(struct usb_serial *serial,
         }
         if (p_priv->cflag & PARENB) {
                 /* note USA_PARITY_NONE == 0 */
-                msg.lcr |= (p_priv->cflag & PARODD)?
+                msg.lcr |= (p_priv->cflag & PARODD) ?
                                         USA_PARITY_ODD : USA_PARITY_EVEN;
         }
         msg.setLcr = 0xff;