1 files changed, 30 insertions, 28 deletions

diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index a01e987c7d32..ddff37fa6339 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -144,9 +144,10 @@ static void iuu_shutdown(struct usb_serial *serial)
         }
 }
 
-static int iuu_tiocmset(struct usb_serial_port *port, struct file *file,
+static int iuu_tiocmset(struct tty_struct *tty, struct file *file,
                         unsigned int set, unsigned int clear)
 {
+        struct usb_serial_port *port = tty->driver_data;
         struct iuu_private *priv = usb_get_serial_port_data(port);
         unsigned long flags;
 
@@ -171,8 +172,9 @@ static int iuu_tiocmset(struct usb_serial_port *port, struct file *file,
  * When no card , the reader respond with TIOCM_CD
  * This is known as CD autodetect mechanism
  */
-static int iuu_tiocmget(struct usb_serial_port *port, struct file *file)
+static int iuu_tiocmget(struct tty_struct *tty, struct file *file)
 {
+        struct usb_serial_port *port = tty->driver_data;
         struct iuu_private *priv = usb_get_serial_port_data(port);
         unsigned long flags;
         int rc;
@@ -316,11 +318,10 @@ static int bulk_immediate(struct usb_serial_port *port, u8 *buf, u8 count)
                                          port->bulk_out_endpointAddress), buf,
                          count, &actual, HZ * 1);
 
-        if (status != IUU_OPERATION_OK) {
+        if (status != IUU_OPERATION_OK)
                 dbg("%s - error = %2x", __func__, status);
-        } else {
+        else
                 dbg("%s - write OK !", __func__);
-        }
         return status;
 }
 
@@ -340,12 +341,10 @@ static int read_immediate(struct usb_serial_port *port, u8 *buf, u8 count)
                                          port->bulk_in_endpointAddress), buf,
                          count, &actual, HZ * 1);
 
-        if (status != IUU_OPERATION_OK) {
+        if (status != IUU_OPERATION_OK)
                 dbg("%s - error = %2x", __func__, status);
-        } else {
+        else
                 dbg("%s - read OK !", __func__);
-        }
-
         return status;
 }
 
@@ -630,7 +629,7 @@ static void read_buf_callback(struct urb *urb)
         }
 
         dbg("%s - %i chars to write", __func__, urb->actual_length);
-        tty = port->tty;
+        tty = port->port.tty;
         if (data == NULL)
                 dbg("%s - data is NULL !!!", __func__);
         if (tty && urb->actual_length && data) {
@@ -752,11 +751,10 @@ static void iuu_uart_read_callback(struct urb *urb)
         /* if nothing to write call again rxcmd */
         dbg("%s - rxcmd recall", __func__);
         iuu_led_activity_off(urb);
-        return;
 }
 
-static int iuu_uart_write(struct usb_serial_port *port, const u8 *buf,
-                          int count)
+static int iuu_uart_write(struct tty_struct *tty, struct usb_serial_port *port,
+                          const u8 *buf, int count)
 {
         struct iuu_private *priv = usb_get_serial_port_data(port);
         unsigned long flags;
@@ -769,14 +767,14 @@ static int iuu_uart_write(struct usb_serial_port *port, const u8 *buf,
         if (priv->writelen > 0) {
                 /* buffer already filled but not commited */
                 spin_unlock_irqrestore(&priv->lock, flags);
-                return (0);
+                return 0;
         }
         /* fill the buffer */
         memcpy(priv->writebuf, buf, count);
         priv->writelen = count;
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        return (count);
+        return count;
 }
 
 static void read_rxcmd_callback(struct urb *urb)
@@ -948,7 +946,8 @@ static int set_control_lines(struct usb_device *dev, u8 value)
         return 0;
 }
 
-static void iuu_close(struct usb_serial_port *port, struct file *filp)
+static void iuu_close(struct tty_struct *tty,
+                        struct usb_serial_port *port, struct file *filp)
 {
         /* iuu_led (port,255,0,0,0); */
         struct usb_serial *serial;
@@ -964,8 +963,8 @@ static void iuu_close(struct usb_serial_port *port, struct file *filp)
 
         iuu_uart_off(port);
         if (serial->dev) {
-                if (port->tty) {
-                        c_cflag = port->tty->termios->c_cflag;
+                if (tty) {
+                        c_cflag = tty->termios->c_cflag;
                         if (c_cflag & HUPCL) {
                                 /* drop DTR and RTS */
                                 priv = usb_get_serial_port_data(port);
@@ -989,7 +988,8 @@ static void iuu_close(struct usb_serial_port *port, struct file *filp)
         }
 }
 
-static int iuu_open(struct usb_serial_port *port, struct file *filp)
+static int iuu_open(struct tty_struct *tty,
+                        struct usb_serial_port *port, struct file *filp)
 {
         struct usb_serial *serial = port->serial;
         u8 *buf;
@@ -1036,15 +1036,17 @@ static int iuu_open(struct usb_serial_port *port, struct file *filp)
 
         /* set the termios structure */
         spin_lock_irqsave(&priv->lock, flags);
-        if (!priv->termios_initialized) {
-                *(port->tty->termios) = tty_std_termios;
-                port->tty->termios->c_cflag = CLOCAL | CREAD | CS8 | B9600
-                                                | TIOCM_CTS | CSTOPB | PARENB;
-                port->tty->termios->c_lflag = 0;
-                port->tty->termios->c_oflag = 0;
-                port->tty->termios->c_iflag = 0;
+        if (tty && !priv->termios_initialized) {
+                *(tty->termios) = tty_std_termios;
+                tty->termios->c_cflag = CLOCAL | CREAD | CS8 | B9600
+                                        | TIOCM_CTS | CSTOPB | PARENB;
+                tty->termios->c_ispeed = 9600;
+                tty->termios->c_ospeed = 9600;
+                tty->termios->c_lflag = 0;
+                tty->termios->c_oflag = 0;
+                tty->termios->c_iflag = 0;
                 priv->termios_initialized = 1;
-                port->tty->low_latency = 1;
+                tty->low_latency = 1;
                 priv->poll = 0;
          }
         spin_unlock_irqrestore(&priv->lock, flags);
@@ -1148,7 +1150,7 @@ static int iuu_open(struct usb_serial_port *port, struct file *filp)
         if (result) {
                 dev_err(&port->dev, "%s - failed submitting read urb,"
                         " error %d\n", __func__, result);
-                iuu_close(port, NULL);
+                iuu_close(tty, port, NULL);
                 return -EPROTO;
         } else {
                 dbg("%s - rxcmd OK", __func__);