1 files changed, 33 insertions, 28 deletions

diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 8f891cbaf9ab..0b8617a9176d 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -17,7 +17,8 @@
 #include <linux/mutex.h>
 
 #define SERIAL_TTY_MAJOR        188     /* Nice legal number now */
-#define SERIAL_TTY_MINORS       255     /* loads of devices :) */
+#define SERIAL_TTY_MINORS       254     /* loads of devices :) */
+#define SERIAL_TTY_NO_MINOR     255     /* No minor was assigned */
 
 /* The maximum number of ports one device can grab at once */
 #define MAX_NUM_PORTS           8
@@ -62,7 +63,7 @@
  */
 struct usb_serial_port {
         struct usb_serial       *serial;
-        struct tty_struct       *tty;
+        struct tty_port         port;
         spinlock_t              lock;
         struct mutex            mutex;
         unsigned char           number;
@@ -89,7 +90,6 @@ struct usb_serial_port {
 
         wait_queue_head_t       write_wait;
         struct work_struct      work;
-        int                     open_count;
         char                    throttled;
         char                    throttle_req;
         char                    console;
@@ -192,7 +192,7 @@ static inline void usb_set_serial_data(struct usb_serial *serial, void *data)
  * The driver.owner field should be set to the module owner of this driver.
  * The driver.name field should be set to the name of this driver (remember
  * it will show up in sysfs, so it needs to be short and to the point.
- * Useing the module name is a good idea.)
+ * Using the module name is a good idea.)
  */
 struct usb_serial_driver {
         const char *description;
@@ -217,22 +217,27 @@ struct usb_serial_driver {
         int (*resume)(struct usb_serial *serial);
 
         /* serial function calls */
-        int  (*open)(struct usb_serial_port *port, struct file *filp);
-        void (*close)(struct usb_serial_port *port, struct file *filp);
-        int  (*write)(struct usb_serial_port *port, const unsigned char *buf,
-                      int count);
-        int  (*write_room)(struct usb_serial_port *port);
-        int  (*ioctl)(struct usb_serial_port *port, struct file *file,
+        /* Called by console with tty = NULL and by tty */
+        int  (*open)(struct tty_struct *tty,
+                        struct usb_serial_port *port, struct file *filp);
+        void (*close)(struct tty_struct *tty,
+                        struct usb_serial_port *port, struct file *filp);
+        int  (*write)(struct tty_struct *tty, struct usb_serial_port *port,
+                        const unsigned char *buf, int count);
+        /* Called only by the tty layer */
+        int  (*write_room)(struct tty_struct *tty);
+        int  (*ioctl)(struct tty_struct *tty, struct file *file,
                       unsigned int cmd, unsigned long arg);
-        void (*set_termios)(struct usb_serial_port *port, struct ktermios *old);
-        void (*break_ctl)(struct usb_serial_port *port, int break_state);
-        int  (*chars_in_buffer)(struct usb_serial_port *port);
-        void (*throttle)(struct usb_serial_port *port);
-        void (*unthrottle)(struct usb_serial_port *port);
-        int  (*tiocmget)(struct usb_serial_port *port, struct file *file);
-        int  (*tiocmset)(struct usb_serial_port *port, struct file *file,
+        void (*set_termios)(struct tty_struct *tty,
+                        struct usb_serial_port *port, struct ktermios *old);
+        void (*break_ctl)(struct tty_struct *tty, int break_state);
+        int  (*chars_in_buffer)(struct tty_struct *tty);
+        void (*throttle)(struct tty_struct *tty);
+        void (*unthrottle)(struct tty_struct *tty);
+        int  (*tiocmget)(struct tty_struct *tty, struct file *file);
+        int  (*tiocmset)(struct tty_struct *tty, struct file *file,
                          unsigned int set, unsigned int clear);
-
+        /* USB events */
         void (*read_int_callback)(struct urb *urb);
         void (*write_int_callback)(struct urb *urb);
         void (*read_bulk_callback)(struct urb *urb);
@@ -270,19 +275,19 @@ static inline void usb_serial_console_disconnect(struct usb_serial *serial) {}
 /* Functions needed by other parts of the usbserial core */
 extern struct usb_serial *usb_serial_get_by_index(unsigned int minor);
 extern void usb_serial_put(struct usb_serial *serial);
-extern int usb_serial_generic_open(struct usb_serial_port *port,
-                                   struct file *filp);
-extern int usb_serial_generic_write(struct usb_serial_port *port,
-                                    const unsigned char *buf, int count);
-extern void usb_serial_generic_close(struct usb_serial_port *port,
-                                     struct file *filp);
+extern int usb_serial_generic_open(struct tty_struct *tty,
+                struct usb_serial_port *port, struct file *filp);
+extern int usb_serial_generic_write(struct tty_struct *tty,
+        struct usb_serial_port *port, const unsigned char *buf, int count);
+extern void usb_serial_generic_close(struct tty_struct *tty,
+                        struct usb_serial_port *port, struct file *filp);
 extern int usb_serial_generic_resume(struct usb_serial *serial);
-extern int usb_serial_generic_write_room(struct usb_serial_port *port);
-extern int usb_serial_generic_chars_in_buffer(struct usb_serial_port *port);
+extern int usb_serial_generic_write_room(struct tty_struct *tty);
+extern int usb_serial_generic_chars_in_buffer(struct tty_struct *tty);
 extern void usb_serial_generic_read_bulk_callback(struct urb *urb);
 extern void usb_serial_generic_write_bulk_callback(struct urb *urb);
-extern void usb_serial_generic_throttle(struct usb_serial_port *port);
-extern void usb_serial_generic_unthrottle(struct usb_serial_port *port);
+extern void usb_serial_generic_throttle(struct tty_struct *tty);
+extern void usb_serial_generic_unthrottle(struct tty_struct *tty);
 extern void usb_serial_generic_shutdown(struct usb_serial *serial);
 extern int usb_serial_generic_register(int debug);
 extern void usb_serial_generic_deregister(void);