Merge branch 'fixes' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / usb / serial / mct_u232.c

diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 5fc2cef30e39f76603421616b3e4a06c9cebd586..9b2cef81cde0284deada9dea2a6faebbee15a43f 100644 (file)
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -33,10 +33,11 @@
  *   - Fixed an endianess problem with the baudrate selection for PowerPC.
  *
  * 06-Dec-2001 Martin Hamilton <martinh@gnu.org>
  *   - Fixed an endianess problem with the baudrate selection for PowerPC.
  *
  * 06-Dec-2001 Martin Hamilton <martinh@gnu.org>

- *     Added support for the Belkin F5U109 DB9 adaptor
+ *   - Added support for the Belkin F5U109 DB9 adaptor

  *
  * 30-May-2001 Greg Kroah-Hartman
  *
  * 30-May-2001 Greg Kroah-Hartman

- *     switched from using spinlock to a semaphore, which fixes lots of problems.
+ *   - switched from using spinlock to a semaphore, which fixes lots of
+ *     problems.

  *
  * 04-May-2001 Stelian Pop
  *   - Set the maximum bulk output size for Sitecom U232-P25 model to 16 bytes
  *
  * 04-May-2001 Stelian Pop
  *   - Set the maximum bulk output size for Sitecom U232-P25 model to 16 bytes


@@ -49,7 +50,7 @@
  * 08-Apr-2001 gb
  *   - Identify version on module load.
  *
  * 08-Apr-2001 gb
  *   - Identify version on module load.
  *

- * 06-Jan-2001 Cornel Ciocirlan 
+ * 06-Jan-2001 Cornel Ciocirlan

  *   - Added support for Sitecom U232-P25 model (Product Id 0x0230)
  *   - Added support for D-Link DU-H3SP USB BAY (Product Id 0x0200)
  *
  *   - Added support for Sitecom U232-P25 model (Product Id 0x0230)
  *   - Added support for D-Link DU-H3SP USB BAY (Product Id 0x0200)
  *


@@ -59,8 +60,8 @@
  *     (lots of things will change if/when the usb-serial core changes to
  *     handle these issues.
  *
  *     (lots of things will change if/when the usb-serial core changes to
  *     handle these issues.
  *

- * 27-Nov-2000 Wolfgang Grandegger
- *   A version for kernel 2.4.0-test10 released to the Linux community 
+ * 27-Nov-2000 Wolfgang Grandegge
+ *   A version for kernel 2.4.0-test10 released to the Linux community

  *   (via linux-usb-devel).
  */
 
  *   (via linux-usb-devel).
  */
 


@@ -73,7 +74,7 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>

-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include "mct_u232.h"
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include "mct_u232.h"


@@ -90,28 +91,21 @@ static int debug;
 /*
  * Function prototypes
  */
 /*
  * Function prototypes
  */

-static int  mct_u232_startup            (struct usb_serial *serial);
-static void mct_u232_shutdown           (struct usb_serial *serial);
-static int  mct_u232_open               (struct usb_serial_port *port,
-                                         struct file *filp);
-static void mct_u232_close              (struct usb_serial_port *port,
-                                         struct file *filp);
-static void mct_u232_read_int_callback   (struct urb *urb);
-static void mct_u232_set_termios         (struct usb_serial_port *port,
-                                         struct ktermios * old);
-static int  mct_u232_ioctl              (struct usb_serial_port *port,
-                                         struct file * file,
-                                         unsigned int cmd,
-                                         unsigned long arg);
-static void mct_u232_break_ctl          (struct usb_serial_port *port,
-                                         int break_state );
-static int  mct_u232_tiocmget           (struct usb_serial_port *port,
-                                         struct file *file);
-static int  mct_u232_tiocmset           (struct usb_serial_port *port,
-                                         struct file *file, unsigned int set,
-                                         unsigned int clear);
-static void mct_u232_throttle           (struct usb_serial_port *port);
-static void mct_u232_unthrottle                 (struct usb_serial_port *port);
+static int  mct_u232_startup(struct usb_serial *serial);
+static void mct_u232_shutdown(struct usb_serial *serial);
+static int  mct_u232_open(struct tty_struct *tty,
+                       struct usb_serial_port *port, struct file *filp);
+static void mct_u232_close(struct tty_struct *tty,
+                       struct usb_serial_port *port, struct file *filp);
+static void mct_u232_read_int_callback(struct urb *urb);
+static void mct_u232_set_termios(struct tty_struct *tty,
+                       struct usb_serial_port *port, struct ktermios *old);
+static void mct_u232_break_ctl(struct tty_struct *tty, int break_state);
+static int  mct_u232_tiocmget(struct tty_struct *tty, struct file *file);
+static int  mct_u232_tiocmset(struct tty_struct *tty, struct file *file,
+                       unsigned int set, unsigned int clear);
+static void mct_u232_throttle(struct tty_struct *tty);
+static void mct_u232_unthrottle(struct tty_struct *tty);

 
 
 /*
 
 
 /*


@@ -125,7 +119,7 @@ static struct usb_device_id id_table_combined [] = {
        { }             /* Terminating entry */
 };
 
        { }             /* Terminating entry */
 };
 

-MODULE_DEVICE_TABLE (usb, id_table_combined);
+MODULE_DEVICE_TABLE(usb, id_table_combined);

 
 static struct usb_driver mct_u232_driver = {
        .name =         "mct_u232",
 
 static struct usb_driver mct_u232_driver = {
        .name =         "mct_u232",


@@ -149,7 +143,6 @@ static struct usb_serial_driver mct_u232_device = {
        .throttle =          mct_u232_throttle,
        .unthrottle =        mct_u232_unthrottle,
        .read_int_callback = mct_u232_read_int_callback,
        .throttle =          mct_u232_throttle,
        .unthrottle =        mct_u232_unthrottle,
        .read_int_callback = mct_u232_read_int_callback,

-       .ioctl =             mct_u232_ioctl,

        .set_termios =       mct_u232_set_termios,
        .break_ctl =         mct_u232_break_ctl,
        .tiocmget =          mct_u232_tiocmget,
        .set_termios =       mct_u232_set_termios,
        .break_ctl =         mct_u232_break_ctl,
        .tiocmget =          mct_u232_tiocmget,


@@ -180,23 +173,34 @@ struct mct_u232_private {
  * Later day 2.6.0-test kernels have new baud rates like B230400 which
  * we do not know how to support. We ignore them for the moment.
  */
  * Later day 2.6.0-test kernels have new baud rates like B230400 which
  * we do not know how to support. We ignore them for the moment.
  */

-static int mct_u232_calculate_baud_rate(struct usb_serial *serial, speed_t value, speed_t *result)
+static int mct_u232_calculate_baud_rate(struct usb_serial *serial,
+                                       speed_t value, speed_t *result)

 {
        *result = value;
 
        if (le16_to_cpu(serial->dev->descriptor.idProduct) == MCT_U232_SITECOM_PID
 {
        *result = value;
 
        if (le16_to_cpu(serial->dev->descriptor.idProduct) == MCT_U232_SITECOM_PID

-         || le16_to_cpu(serial->dev->descriptor.idProduct) == MCT_U232_BELKIN_F5U109_PID) {
+               || le16_to_cpu(serial->dev->descriptor.idProduct) == MCT_U232_BELKIN_F5U109_PID) {

                switch (value) {
                switch (value) {

-               case    300: return 0x01;
-               case    600: return 0x02; /* this one not tested */
-               case   1200: return 0x03;
-               case   2400: return 0x04;
-               case   4800: return 0x06;
-               case   9600: return 0x08;
-               case  19200: return 0x09;
-               case  38400: return 0x0a;
-               case  57600: return 0x0b;
-               case 115200: return 0x0c;
+               case 300:
+                       return 0x01;
+               case 600:
+                       return 0x02; /* this one not tested */
+               case 1200:
+                       return 0x03;
+               case 2400:
+                       return 0x04;
+               case 4800:
+                       return 0x06;
+               case 9600:
+                       return 0x08;
+               case 19200:
+                       return 0x09;
+               case 38400:
+                       return 0x0a;
+               case 57600:
+                       return 0x0b;
+               case 115200:
+                       return 0x0c;

                default:
                        *result = 9600;
                        return 0x08;
                default:
                        *result = 9600;
                        return 0x08;


@@ -224,26 +228,27 @@ static int mct_u232_calculate_baud_rate(struct usb_serial *serial, speed_t value
        }
 }
 
        }
 }
 

-static int mct_u232_set_baud_rate(struct usb_serial *serial, struct usb_serial_port *port,
-                                 speed_t value)
+static int mct_u232_set_baud_rate(struct tty_struct *tty,
+       struct usb_serial *serial, struct usb_serial_port *port, speed_t value)

 {
        __le32 divisor;
 {
        __le32 divisor;

-        int rc;
-        unsigned char zero_byte = 0;
-        unsigned char cts_enable_byte = 0;
-        speed_t speed;
-
-       divisor = cpu_to_le32(mct_u232_calculate_baud_rate(serial, value, &speed));
-
-        rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
-                             MCT_U232_SET_BAUD_RATE_REQUEST,
-                            MCT_U232_SET_REQUEST_TYPE,
-                             0, 0, &divisor, MCT_U232_SET_BAUD_RATE_SIZE,
-                            WDR_TIMEOUT);
+       int rc;
+       unsigned char zero_byte = 0;
+       unsigned char cts_enable_byte = 0;
+       speed_t speed;
+
+       divisor = cpu_to_le32(mct_u232_calculate_baud_rate(serial, value,
+                                                               &speed));
+
+       rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
+                               MCT_U232_SET_BAUD_RATE_REQUEST,
+                               MCT_U232_SET_REQUEST_TYPE,
+                               0, 0, &divisor, MCT_U232_SET_BAUD_RATE_SIZE,
+                               WDR_TIMEOUT);

        if (rc < 0)     /*FIXME: What value speed results */
                err("Set BAUD RATE %d failed (error = %d)", value, rc);
        else
        if (rc < 0)     /*FIXME: What value speed results */
                err("Set BAUD RATE %d failed (error = %d)", value, rc);
        else

-               tty_encode_baud_rate(port->tty, speed, speed);
+               tty_encode_baud_rate(tty, speed, speed);

        dbg("set_baud_rate: value: 0x%x, divisor: 0x%x", value, divisor);
 
        /* Mimic the MCT-supplied Windows driver (version 1.21P.0104), which
        dbg("set_baud_rate: value: 0x%x, divisor: 0x%x", value, divisor);
 
        /* Mimic the MCT-supplied Windows driver (version 1.21P.0104), which


@@ -258,55 +263,55 @@ static int mct_u232_set_baud_rate(struct usb_serial *serial, struct usb_serial_p
           whether data will be transmitted to a device which is not asserting
           the 'CTS' signal.  If the second message's data byte is zero, data
           will be transmitted even if 'CTS' is not asserted (i.e. no hardware
           whether data will be transmitted to a device which is not asserting
           the 'CTS' signal.  If the second message's data byte is zero, data
           will be transmitted even if 'CTS' is not asserted (i.e. no hardware

-          flow control).  if the second message's data byte is nonzero (a value
-          of 1 is used by this driver), data will not be transmitted to a device
-          which is not asserting 'CTS'.
+          flow control).  if the second message's data byte is nonzero (a
+          value of 1 is used by this driver), data will not be transmitted to
+          a device which is not asserting 'CTS'.

        */
 
        rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
        */
 
        rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),

-                            MCT_U232_SET_UNKNOWN1_REQUEST, 
-                            MCT_U232_SET_REQUEST_TYPE,
-                            0, 0, &zero_byte, MCT_U232_SET_UNKNOWN1_SIZE, 
-                            WDR_TIMEOUT);
+                               MCT_U232_SET_UNKNOWN1_REQUEST,
+                               MCT_U232_SET_REQUEST_TYPE,
+                               0, 0, &zero_byte, MCT_U232_SET_UNKNOWN1_SIZE,
+                               WDR_TIMEOUT);

        if (rc < 0)
        if (rc < 0)

-               err("Sending USB device request code %d failed (error = %d)", 
+               err("Sending USB device request code %d failed (error = %d)",

                    MCT_U232_SET_UNKNOWN1_REQUEST, rc);
 
                    MCT_U232_SET_UNKNOWN1_REQUEST, rc);
 

-       if (port && C_CRTSCTS(port->tty)) {
+       if (port && C_CRTSCTS(tty))

           cts_enable_byte = 1;
           cts_enable_byte = 1;

-       }

 
 

-        dbg("set_baud_rate: send second control message, data = %02X", cts_enable_byte);
+       dbg("set_baud_rate: send second control message, data = %02X",
+                                                       cts_enable_byte);

        rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
        rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),

-                            MCT_U232_SET_CTS_REQUEST,
-                            MCT_U232_SET_REQUEST_TYPE,
-                            0, 0, &cts_enable_byte, MCT_U232_SET_CTS_SIZE,
-                            WDR_TIMEOUT);
+                       MCT_U232_SET_CTS_REQUEST,
+                       MCT_U232_SET_REQUEST_TYPE,
+                       0, 0, &cts_enable_byte, MCT_U232_SET_CTS_SIZE,
+                       WDR_TIMEOUT);

        if (rc < 0)
        if (rc < 0)

-         err("Sending USB device request code %d failed (error = %d)",
-             MCT_U232_SET_CTS_REQUEST, rc);
+               err("Sending USB device request code %d failed (error = %d)",
+                                       MCT_U232_SET_CTS_REQUEST, rc);

 
 

-        return rc;
+       return rc;

 } /* mct_u232_set_baud_rate */
 
 static int mct_u232_set_line_ctrl(struct usb_serial *serial, unsigned char lcr)
 {
 } /* mct_u232_set_baud_rate */
 
 static int mct_u232_set_line_ctrl(struct usb_serial *serial, unsigned char lcr)
 {

-        int rc;
-        rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
-                             MCT_U232_SET_LINE_CTRL_REQUEST,
-                            MCT_U232_SET_REQUEST_TYPE,
-                             0, 0, &lcr, MCT_U232_SET_LINE_CTRL_SIZE,
-                            WDR_TIMEOUT);
+       int rc;
+       rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
+                       MCT_U232_SET_LINE_CTRL_REQUEST,
+                       MCT_U232_SET_REQUEST_TYPE,
+                       0, 0, &lcr, MCT_U232_SET_LINE_CTRL_SIZE,
+                       WDR_TIMEOUT);

        if (rc < 0)
                err("Set LINE CTRL 0x%x failed (error = %d)", lcr, rc);
        dbg("set_line_ctrl: 0x%x", lcr);
        if (rc < 0)
                err("Set LINE CTRL 0x%x failed (error = %d)", lcr, rc);
        dbg("set_line_ctrl: 0x%x", lcr);

-        return rc;
+       return rc;

 } /* mct_u232_set_line_ctrl */
 
 static int mct_u232_set_modem_ctrl(struct usb_serial *serial,
                                   unsigned int control_state)
 {
 } /* mct_u232_set_line_ctrl */
 
 static int mct_u232_set_modem_ctrl(struct usb_serial *serial,
                                   unsigned int control_state)
 {

-        int rc;
+       int rc;

        unsigned char mcr = MCT_U232_MCR_NONE;
 
        if (control_state & TIOCM_DTR)
        unsigned char mcr = MCT_U232_MCR_NONE;
 
        if (control_state & TIOCM_DTR)


@@ -314,37 +319,39 @@ static int mct_u232_set_modem_ctrl(struct usb_serial *serial,
        if (control_state & TIOCM_RTS)
                mcr |= MCT_U232_MCR_RTS;
 
        if (control_state & TIOCM_RTS)
                mcr |= MCT_U232_MCR_RTS;
 

-        rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
-                             MCT_U232_SET_MODEM_CTRL_REQUEST,
-                            MCT_U232_SET_REQUEST_TYPE,
-                             0, 0, &mcr, MCT_U232_SET_MODEM_CTRL_SIZE,
-                            WDR_TIMEOUT);
+       rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
+                       MCT_U232_SET_MODEM_CTRL_REQUEST,
+                       MCT_U232_SET_REQUEST_TYPE,
+                       0, 0, &mcr, MCT_U232_SET_MODEM_CTRL_SIZE,
+                       WDR_TIMEOUT);

        if (rc < 0)
                err("Set MODEM CTRL 0x%x failed (error = %d)", mcr, rc);
        dbg("set_modem_ctrl: state=0x%x ==> mcr=0x%x", control_state, mcr);
 
        if (rc < 0)
                err("Set MODEM CTRL 0x%x failed (error = %d)", mcr, rc);
        dbg("set_modem_ctrl: state=0x%x ==> mcr=0x%x", control_state, mcr);
 

-        return rc;
+       return rc;

 } /* mct_u232_set_modem_ctrl */
 
 } /* mct_u232_set_modem_ctrl */
 

-static int mct_u232_get_modem_stat(struct usb_serial *serial, unsigned char *msr)
+static int mct_u232_get_modem_stat(struct usb_serial *serial,
+                                               unsigned char *msr)

 {
 {

-        int rc;
-        rc = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
-                             MCT_U232_GET_MODEM_STAT_REQUEST,
-                            MCT_U232_GET_REQUEST_TYPE,
-                             0, 0, msr, MCT_U232_GET_MODEM_STAT_SIZE,
-                            WDR_TIMEOUT);
+       int rc;
+       rc = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
+                       MCT_U232_GET_MODEM_STAT_REQUEST,
+                       MCT_U232_GET_REQUEST_TYPE,
+                       0, 0, msr, MCT_U232_GET_MODEM_STAT_SIZE,
+                       WDR_TIMEOUT);

        if (rc < 0) {
                err("Get MODEM STATus failed (error = %d)", rc);
                *msr = 0;
        }
        dbg("get_modem_stat: 0x%x", *msr);
        if (rc < 0) {
                err("Get MODEM STATus failed (error = %d)", rc);
                *msr = 0;
        }
        dbg("get_modem_stat: 0x%x", *msr);

-        return rc;
+       return rc;

 } /* mct_u232_get_modem_stat */
 
 } /* mct_u232_get_modem_stat */
 

-static void mct_u232_msr_to_state(unsigned int *control_state, unsigned char msr)
+static void mct_u232_msr_to_state(unsigned int *control_state,
+                                               unsigned char msr)

 {
 {

-       /* Translate Control Line states */
+       /* Translate Control Line states */

        if (msr & MCT_U232_MSR_DSR)
                *control_state |=  TIOCM_DSR;
        else
        if (msr & MCT_U232_MSR_DSR)
                *control_state |=  TIOCM_DSR;
        else


@@ -361,14 +368,14 @@ static void mct_u232_msr_to_state(unsigned int *control_state, unsigned char msr
                *control_state |=  TIOCM_CD;
        else
                *control_state &= ~TIOCM_CD;
                *control_state |=  TIOCM_CD;
        else
                *control_state &= ~TIOCM_CD;

-       dbg("msr_to_state: msr=0x%x ==> state=0x%x", msr, *control_state);
+       dbg("msr_to_state: msr=0x%x ==> state=0x%x", msr, *control_state);

 } /* mct_u232_msr_to_state */
 
 /*
  * Driver's tty interface functions
  */
 
 } /* mct_u232_msr_to_state */
 
 /*
  * Driver's tty interface functions
  */
 

-static int mct_u232_startup (struct usb_serial *serial)
+static int mct_u232_startup(struct usb_serial *serial)

 {
        struct mct_u232_private *priv;
        struct usb_serial_port *port, *rport;
 {
        struct mct_u232_private *priv;
        struct usb_serial_port *port, *rport;


@@ -390,18 +397,18 @@ static int mct_u232_startup (struct usb_serial *serial)
        rport->interrupt_in_urb = NULL;
        port->read_urb->context = port;
 
        rport->interrupt_in_urb = NULL;
        port->read_urb->context = port;
 

-       return (0);
+       return 0;

 } /* mct_u232_startup */
 
 
 } /* mct_u232_startup */
 
 

-static void mct_u232_shutdown (struct usb_serial *serial)
+static void mct_u232_shutdown(struct usb_serial *serial)

 {
        struct mct_u232_private *priv;
        int i;
 {
        struct mct_u232_private *priv;
        int i;

-       
+

        dbg("%s", __func__);
 
        dbg("%s", __func__);
 

-       for (i=0; i < serial->num_ports; ++i) {
+       for (i = 0; i < serial->num_ports; ++i) {

                /* My special items, the standard routines free my urbs */
                priv = usb_get_serial_port_data(serial->port[i]);
                if (priv) {
                /* My special items, the standard routines free my urbs */
                priv = usb_get_serial_port_data(serial->port[i]);
                if (priv) {


@@ -411,7 +418,8 @@ static void mct_u232_shutdown (struct usb_serial *serial)
        }
 } /* mct_u232_shutdown */
 
        }
 } /* mct_u232_shutdown */
 

-static int  mct_u232_open (struct usb_serial_port *port, struct file *filp)
+static int  mct_u232_open(struct tty_struct *tty,
+                       struct usb_serial_port *port, struct file *filp)

 {
        struct usb_serial *serial = port->serial;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
 {
        struct usb_serial *serial = port->serial;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);


@@ -428,21 +436,22 @@ static int  mct_u232_open (struct usb_serial_port *port, struct file *filp)
         * it seems to be able to accept only 16 bytes (and that's what
         * SniffUSB says too...)
         */
         * it seems to be able to accept only 16 bytes (and that's what
         * SniffUSB says too...)
         */

-       if (le16_to_cpu(serial->dev->descriptor.idProduct) == MCT_U232_SITECOM_PID)
+       if (le16_to_cpu(serial->dev->descriptor.idProduct)
+                                               == MCT_U232_SITECOM_PID)

                port->bulk_out_size = 16;
 
                port->bulk_out_size = 16;
 

-       /* Do a defined restart: the normal serial device seems to 
+       /* Do a defined restart: the normal serial device seems to

         * always turn on DTR and RTS here, so do the same. I'm not
         * sure if this is really necessary. But it should not harm
         * either.
         */
        spin_lock_irqsave(&priv->lock, flags);
         * always turn on DTR and RTS here, so do the same. I'm not
         * sure if this is really necessary. But it should not harm
         * either.
         */
        spin_lock_irqsave(&priv->lock, flags);

-       if (port->tty->termios->c_cflag & CBAUD)
+       if (tty && (tty->termios->c_cflag & CBAUD))

                priv->control_state = TIOCM_DTR | TIOCM_RTS;
        else
                priv->control_state = 0;
                priv->control_state = TIOCM_DTR | TIOCM_RTS;
        else
                priv->control_state = 0;

-       
-       priv->last_lcr = (MCT_U232_DATA_BITS_8 | 
+
+       priv->last_lcr = (MCT_U232_DATA_BITS_8 |

                          MCT_U232_PARITY_NONE |
                          MCT_U232_STOP_BITS_1);
        control_state = priv->control_state;
                          MCT_U232_PARITY_NONE |
                          MCT_U232_STOP_BITS_1);
        control_state = priv->control_state;


@@ -481,15 +490,16 @@ error:
 } /* mct_u232_open */
 
 
 } /* mct_u232_open */
 
 

-static void mct_u232_close (struct usb_serial_port *port, struct file *filp)
+static void mct_u232_close(struct tty_struct *tty,
+                       struct usb_serial_port *port, struct file *filp)

 {
        unsigned int c_cflag;
        unsigned int control_state;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
        dbg("%s port %d", __func__, port->number);
 
 {
        unsigned int c_cflag;
        unsigned int control_state;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
        dbg("%s port %d", __func__, port->number);
 

-       if (port->tty) {
-               c_cflag = port->tty->termios->c_cflag;
+       if (tty) {
+               c_cflag = tty->termios->c_cflag;

                mutex_lock(&port->serial->disc_mutex);
                if (c_cflag & HUPCL && !port->serial->disconnected) {
                        /* drop DTR and RTS */
                mutex_lock(&port->serial->disc_mutex);
                if (c_cflag & HUPCL && !port->serial->disconnected) {
                        /* drop DTR and RTS */


@@ -512,7 +522,7 @@ static void mct_u232_close (struct usb_serial_port *port, struct file *filp)
 } /* mct_u232_close */
 
 
 } /* mct_u232_close */
 
 

-static void mct_u232_read_int_callback (struct urb *urb)
+static void mct_u232_read_int_callback(struct urb *urb)

 {
        struct usb_serial_port *port = urb->context;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
 {
        struct usb_serial_port *port = urb->context;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);


@@ -545,36 +555,35 @@ static void mct_u232_read_int_callback (struct urb *urb)
                return;
        }
 
                return;
        }
 

-        dbg("%s - port %d", __func__, port->number);
-       usb_serial_debug_data(debug, &port->dev, __func__, urb->actual_length, data);
+       dbg("%s - port %d", __func__, port->number);
+       usb_serial_debug_data(debug, &port->dev, __func__,
+                                       urb->actual_length, data);

 
        /*
         * Work-a-round: handle the 'usual' bulk-in pipe here
         */
        if (urb->transfer_buffer_length > 2) {
 
        /*
         * Work-a-round: handle the 'usual' bulk-in pipe here
         */
        if (urb->transfer_buffer_length > 2) {

-               int i;
-               tty = port->tty;
+               tty = tty_port_tty_get(&port->port);

                if (urb->actual_length) {
                if (urb->actual_length) {

-                       for (i = 0; i < urb->actual_length ; ++i) {
-                               tty_insert_flip_char(tty, data[i], 0);
-                       }
+                       tty_insert_flip_string(tty, data, urb->actual_length);

                        tty_flip_buffer_push(tty);
                        tty_flip_buffer_push(tty);

+                       tty_kref_put(tty);

                }
                goto exit;
        }
                }
                goto exit;
        }

-       
+

        /*
         * The interrupt-in pipe signals exceptional conditions (modem line
         * signal changes and errors). data[0] holds MSR, data[1] holds LSR.
         */
        spin_lock_irqsave(&priv->lock, flags);
        priv->last_msr = data[MCT_U232_MSR_INDEX];
        /*
         * The interrupt-in pipe signals exceptional conditions (modem line
         * signal changes and errors). data[0] holds MSR, data[1] holds LSR.
         */
        spin_lock_irqsave(&priv->lock, flags);
        priv->last_msr = data[MCT_U232_MSR_INDEX];

-       
+

        /* Record Control Line states */
        mct_u232_msr_to_state(&priv->control_state, priv->last_msr);
 
 #if 0
        /* Record Control Line states */
        mct_u232_msr_to_state(&priv->control_state, priv->last_msr);
 
 #if 0

-       /* Not yet handled. See belin_sa.c for further information */
+       /* Not yet handled. See belkin_sa.c for further information */

        /* Now to report any errors */
        priv->last_lsr = data[MCT_U232_LSR_INDEX];
        /*
        /* Now to report any errors */
        priv->last_lsr = data[MCT_U232_LSR_INDEX];
        /*


@@ -583,7 +592,7 @@ static void mct_u232_read_int_callback (struct urb *urb)
         * to look in to this before committing any code.
         */
        if (priv->last_lsr & MCT_U232_LSR_ERR) {
         * to look in to this before committing any code.
         */
        if (priv->last_lsr & MCT_U232_LSR_ERR) {

-               tty = port->tty;
+               tty = tty_port_tty_get(&port->port);

                /* Overrun Error */
                if (priv->last_lsr & MCT_U232_LSR_OE) {
                }
                /* Overrun Error */
                if (priv->last_lsr & MCT_U232_LSR_OE) {
                }


@@ -596,22 +605,24 @@ static void mct_u232_read_int_callback (struct urb *urb)
                /* Break Indicator */
                if (priv->last_lsr & MCT_U232_LSR_BI) {
                }
                /* Break Indicator */
                if (priv->last_lsr & MCT_U232_LSR_BI) {
                }

+               tty_kref_put(tty);

        }
 #endif
        spin_unlock_irqrestore(&priv->lock, flags);
 exit:
        }
 #endif
        spin_unlock_irqrestore(&priv->lock, flags);
 exit:

-       retval = usb_submit_urb (urb, GFP_ATOMIC);
+       retval = usb_submit_urb(urb, GFP_ATOMIC);

        if (retval)
        if (retval)

-               err ("%s - usb_submit_urb failed with result %d",
+               err("%s - usb_submit_urb failed with result %d",

                     __func__, retval);
 } /* mct_u232_read_int_callback */
 
                     __func__, retval);
 } /* mct_u232_read_int_callback */
 

-static void mct_u232_set_termios (struct usb_serial_port *port,
-                                 struct ktermios *old_termios)
+static void mct_u232_set_termios(struct tty_struct *tty,
+                                struct usb_serial_port *port,
+                                struct ktermios *old_termios)

 {
        struct usb_serial *serial = port->serial;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
 {
        struct usb_serial *serial = port->serial;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);

-       struct ktermios *termios = port->tty->termios;
+       struct ktermios *termios = tty->termios;

        unsigned int cflag = termios->c_cflag;
        unsigned int old_cflag = old_termios->c_cflag;
        unsigned long flags;
        unsigned int cflag = termios->c_cflag;
        unsigned int old_cflag = old_termios->c_cflag;
        unsigned long flags;


@@ -631,20 +642,20 @@ static void mct_u232_set_termios (struct usb_serial_port *port,
         * Premature optimization is the root of all evil.
         */
 
         * Premature optimization is the root of all evil.
         */
 

-        /* reassert DTR and RTS on transition from B0 */
+       /* reassert DTR and RTS on transition from B0 */

        if ((old_cflag & CBAUD) == B0) {
                dbg("%s: baud was B0", __func__);
                control_state |= TIOCM_DTR | TIOCM_RTS;
                mct_u232_set_modem_ctrl(serial, control_state);
        }
 
        if ((old_cflag & CBAUD) == B0) {
                dbg("%s: baud was B0", __func__);
                control_state |= TIOCM_DTR | TIOCM_RTS;
                mct_u232_set_modem_ctrl(serial, control_state);
        }
 

-       mct_u232_set_baud_rate(serial, port, tty_get_baud_rate(port->tty));
+       mct_u232_set_baud_rate(tty, serial, port, tty_get_baud_rate(tty));

 
 

-       if ((cflag & CBAUD) == B0 ) {
+       if ((cflag & CBAUD) == B0) {

                dbg("%s: baud is B0", __func__);
                /* Drop RTS and DTR */
                control_state &= ~(TIOCM_DTR | TIOCM_RTS);
                dbg("%s: baud is B0", __func__);
                /* Drop RTS and DTR */
                control_state &= ~(TIOCM_DTR | TIOCM_RTS);

-                       mct_u232_set_modem_ctrl(serial, control_state);
+               mct_u232_set_modem_ctrl(serial, control_state);

        }
 
        /*
        }
 
        /*


@@ -689,8 +700,9 @@ static void mct_u232_set_termios (struct usb_serial_port *port,
        spin_unlock_irqrestore(&priv->lock, flags);
 } /* mct_u232_set_termios */
 
        spin_unlock_irqrestore(&priv->lock, flags);
 } /* mct_u232_set_termios */
 

-static void mct_u232_break_ctl( struct usb_serial_port *port, int break_state )
+static void mct_u232_break_ctl(struct tty_struct *tty, int break_state)

 {
 {

+       struct usb_serial_port *port = tty->driver_data;

        struct usb_serial *serial = port->serial;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
        unsigned char lcr;
        struct usb_serial *serial = port->serial;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
        unsigned char lcr;


@@ -709,12 +721,13 @@ static void mct_u232_break_ctl( struct usb_serial_port *port, int break_state )
 } /* mct_u232_break_ctl */
 
 
 } /* mct_u232_break_ctl */
 
 

-static int mct_u232_tiocmget (struct usb_serial_port *port, struct file *file)
+static int mct_u232_tiocmget(struct tty_struct *tty, struct file *file)

 {
 {

+       struct usb_serial_port *port = tty->driver_data;

        struct mct_u232_private *priv = usb_get_serial_port_data(port);
        unsigned int control_state;
        unsigned long flags;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
        unsigned int control_state;
        unsigned long flags;

-       
+

        dbg("%s", __func__);
 
        spin_lock_irqsave(&priv->lock, flags);
        dbg("%s", __func__);
 
        spin_lock_irqsave(&priv->lock, flags);


@@ -724,14 +737,15 @@ static int mct_u232_tiocmget (struct usb_serial_port *port, struct file *file)
        return control_state;
 }
 
        return control_state;
 }
 

-static int mct_u232_tiocmset (struct usb_serial_port *port, struct file *file,
+static int mct_u232_tiocmset(struct tty_struct *tty, struct file *file,

                              unsigned int set, unsigned int clear)
 {
                              unsigned int set, unsigned int clear)
 {

+       struct usb_serial_port *port = tty->driver_data;

        struct usb_serial *serial = port->serial;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
        unsigned int control_state;
        unsigned long flags;
        struct usb_serial *serial = port->serial;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
        unsigned int control_state;
        unsigned long flags;

-       
+

        dbg("%s", __func__);
 
        spin_lock_irqsave(&priv->lock, flags);
        dbg("%s", __func__);
 
        spin_lock_irqsave(&priv->lock, flags);


@@ -751,77 +765,50 @@ static int mct_u232_tiocmset (struct usb_serial_port *port, struct file *file,
        return mct_u232_set_modem_ctrl(serial, control_state);
 }
 
        return mct_u232_set_modem_ctrl(serial, control_state);
 }
 

-static int mct_u232_ioctl (struct usb_serial_port *port, struct file * file,
-                          unsigned int cmd, unsigned long arg)
-{
-       dbg("%scmd=0x%x", __func__, cmd);
-
-       /* Based on code from acm.c and others */
-       switch (cmd) {
-       case TIOCMIWAIT:
-               /* wait for any of the 4 modem inputs (DCD,RI,DSR,CTS)*/
-               /* TODO */
-               return( 0 );
-
-       case TIOCGICOUNT:
-               /* return count of modemline transitions */
-               /* TODO */
-               return 0;
-
-       default:
-               dbg("%s: arg not supported - 0x%04x", __func__,cmd);
-               return(-ENOIOCTLCMD);
-               break;
-       }
-       return 0;
-} /* mct_u232_ioctl */
-
-static void mct_u232_throttle (struct usb_serial_port *port)
+static void mct_u232_throttle(struct tty_struct *tty)

 {
 {

+       struct usb_serial_port *port = tty->driver_data;

        struct mct_u232_private *priv = usb_get_serial_port_data(port);
        unsigned long flags;
        unsigned int control_state;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
        unsigned long flags;
        unsigned int control_state;

-       struct tty_struct *tty;

 
 

-       tty = port->tty;

        dbg("%s - port %d", __func__, port->number);
 
        spin_lock_irqsave(&priv->lock, flags);
        priv->rx_flags |= THROTTLED;
        if (C_CRTSCTS(tty)) {
        dbg("%s - port %d", __func__, port->number);
 
        spin_lock_irqsave(&priv->lock, flags);
        priv->rx_flags |= THROTTLED;
        if (C_CRTSCTS(tty)) {

-         priv->control_state &= ~TIOCM_RTS;
-         control_state = priv->control_state;
-         spin_unlock_irqrestore(&priv->lock, flags);
-         (void) mct_u232_set_modem_ctrl(port->serial, control_state);
+               priv->control_state &= ~TIOCM_RTS;
+               control_state = priv->control_state;
+               spin_unlock_irqrestore(&priv->lock, flags);
+               (void) mct_u232_set_modem_ctrl(port->serial, control_state);

        } else {
        } else {

-         spin_unlock_irqrestore(&priv->lock, flags);
+               spin_unlock_irqrestore(&priv->lock, flags);

        }
 }
 
 
        }
 }
 
 

-static void mct_u232_unthrottle (struct usb_serial_port *port)
+static void mct_u232_unthrottle(struct tty_struct *tty)

 {
 {

+       struct usb_serial_port *port = tty->driver_data;

        struct mct_u232_private *priv = usb_get_serial_port_data(port);
        unsigned long flags;
        unsigned int control_state;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
        unsigned long flags;
        unsigned int control_state;

-       struct tty_struct *tty;

 
        dbg("%s - port %d", __func__, port->number);
 
 
        dbg("%s - port %d", __func__, port->number);
 

-       tty = port->tty;

        spin_lock_irqsave(&priv->lock, flags);
        if ((priv->rx_flags & THROTTLED) && C_CRTSCTS(tty)) {
        spin_lock_irqsave(&priv->lock, flags);
        if ((priv->rx_flags & THROTTLED) && C_CRTSCTS(tty)) {

-         priv->rx_flags &= ~THROTTLED;
-         priv->control_state |= TIOCM_RTS;
-         control_state = priv->control_state;
-         spin_unlock_irqrestore(&priv->lock, flags);
-         (void) mct_u232_set_modem_ctrl(port->serial, control_state);
+               priv->rx_flags &= ~THROTTLED;
+               priv->control_state |= TIOCM_RTS;
+               control_state = priv->control_state;
+               spin_unlock_irqrestore(&priv->lock, flags);
+               (void) mct_u232_set_modem_ctrl(port->serial, control_state);

        } else {
        } else {

-         spin_unlock_irqrestore(&priv->lock, flags);
+               spin_unlock_irqrestore(&priv->lock, flags);

        }
 }
 
        }
 }
 

-static int __init mct_u232_init (void)
+static int __init mct_u232_init(void)

 {
        int retval;
        retval = usb_serial_register(&mct_u232_device);
 {
        int retval;
        retval = usb_serial_register(&mct_u232_device);


@@ -839,18 +826,17 @@ failed_usb_serial_register:
 }
 
 
 }
 
 

-static void __exit mct_u232_exit (void)
+static void __exit mct_u232_exit(void)

 {
 {

-       usb_deregister (&mct_u232_driver);
-       usb_serial_deregister (&mct_u232_device);
+       usb_deregister(&mct_u232_driver);
+       usb_serial_deregister(&mct_u232_device);

 }
 
 }
 

-
-module_init (mct_u232_init);
+module_init(mct_u232_init);

 module_exit(mct_u232_exit);
 
 module_exit(mct_u232_exit);
 

-MODULE_AUTHOR( DRIVER_AUTHOR );
-MODULE_DESCRIPTION( DRIVER_DESC );
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);

 MODULE_LICENSE("GPL");
 
 module_param(debug, bool, S_IRUGO | S_IWUSR);
 MODULE_LICENSE("GPL");
 
 module_param(debug, bool, S_IRUGO | S_IWUSR);