Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (128 commits)
  USB: fix codingstyle issues in drivers/usb/core/*.c
  USB: fix codingstyle issues in drivers/usb/core/message.c
  USB: fix codingstyle issues in drivers/usb/core/hcd-pci.c
  USB: fix codingstyle issues in drivers/usb/core/devio.c
  USB: fix codingstyle issues in drivers/usb/core/devices.c
  USB: fix codingstyle issues in drivers/usb/core/*.h
  USB: fix codingstyle issues in include/linux/usb/
  USB: fix codingstyle issues in include/linux/usb.h
  USB: mark USB drivers as being GPL only
  USB: use a real vendor and product id for root hubs
  USB: mount options: fix usbfs
  USB: Fix usb_serial_driver structure for Kobil cardreader driver.
  usb: ehci should use u16 for isochronous intervals
  usb: ehci, remove false clear-reset path
  USB: Use menuconfig objects
  usb: ohci-sm501 driver
  usb: dma bounce buffer support
  USB: last abuses of intfdata in close for usb-serial drivers
  USB: kl5kusb105 don't flush to logically disconnected devices
  USB: oti6858: cleanup
  ...

1 files changed, 90 insertions, 70 deletions

diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 488ce128885c..21b4a1c6f585 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -20,7 +20,8 @@
 #define SERIAL_TTY_MAJOR        188     /* Nice legal number now */
 #define SERIAL_TTY_MINORS       255     /* loads of devices :) */
 
-#define MAX_NUM_PORTS           8       /* The maximum number of ports one device can grab at once */
+/* The maximum number of ports one device can grab at once */
+#define MAX_NUM_PORTS           8
 
 /* parity check flag */
 #define RELEVANT_IFLAG(iflag)   (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
@@ -61,29 +62,29 @@
  * ports of a device.
  */
 struct usb_serial_port {
-        struct usb_serial *     serial;
-        struct tty_struct *     tty;
+        struct usb_serial       *serial;
+        struct tty_struct       *tty;
         spinlock_t              lock;
         struct mutex            mutex;
         unsigned char           number;
 
-        unsigned char *         interrupt_in_buffer;
-        struct urb *            interrupt_in_urb;
+        unsigned char           *interrupt_in_buffer;
+        struct urb              *interrupt_in_urb;
         __u8                    interrupt_in_endpointAddress;
 
-        unsigned char *         interrupt_out_buffer;
+        unsigned char           *interrupt_out_buffer;
         int                     interrupt_out_size;
-        struct urb *            interrupt_out_urb;
+        struct urb              *interrupt_out_urb;
         __u8                    interrupt_out_endpointAddress;
 
-        unsigned char *         bulk_in_buffer;
+        unsigned char           *bulk_in_buffer;
         int                     bulk_in_size;
-        struct urb *            read_urb;
+        struct urb              *read_urb;
         __u8                    bulk_in_endpointAddress;
 
-        unsigned char *         bulk_out_buffer;
+        unsigned char           *bulk_out_buffer;
         int                     bulk_out_size;
-        struct urb *            write_urb;
+        struct urb              *write_urb;
         int                     write_urb_busy;
         __u8                    bulk_out_endpointAddress;
 
@@ -92,17 +93,19 @@ struct usb_serial_port {
         int                     open_count;
         char                    throttled;
         char                    throttle_req;
+        char                    console;
         struct device           dev;
 };
 #define to_usb_serial_port(d) container_of(d, struct usb_serial_port, dev)
 
 /* get and set the port private data pointer helper functions */
-static inline void *usb_get_serial_port_data (struct usb_serial_port *port)
+static inline void *usb_get_serial_port_data(struct usb_serial_port *port)
 {
         return dev_get_drvdata(&port->dev);
 }
 
-static inline void usb_set_serial_port_data (struct usb_serial_port *port, void *data)
+static inline void usb_set_serial_port_data(struct usb_serial_port *port,
+                                            void *data)
 {
         dev_set_drvdata(&port->dev, data);
 }
@@ -125,9 +128,10 @@ static inline void usb_set_serial_port_data (struct usb_serial_port *port, void
  *      usb_set_serial_data() to access this.
  */
 struct usb_serial {
-        struct usb_device *             dev;
-        struct usb_serial_driver *      type;
-        struct usb_interface *          interface;
+        struct usb_device               *dev;
+        struct usb_serial_driver        *type;
+        struct usb_interface            *interface;
+        unsigned char                   disconnected;
         unsigned char                   minor;
         unsigned char                   num_ports;
         unsigned char                   num_port_pointers;
@@ -135,29 +139,30 @@ struct usb_serial {
         char                            num_interrupt_out;
         char                            num_bulk_in;
         char                            num_bulk_out;
-        struct usb_serial_port *        port[MAX_NUM_PORTS];
+        struct usb_serial_port          *port[MAX_NUM_PORTS];
         struct kref                     kref;
-        void *                          private;
+        struct mutex                    disc_mutex;
+        void                            *private;
 };
 #define to_usb_serial(d) container_of(d, struct usb_serial, kref)
 
 #define NUM_DONT_CARE   99
 
 /* get and set the serial private data pointer helper functions */
-static inline void *usb_get_serial_data (struct usb_serial *serial)
+static inline void *usb_get_serial_data(struct usb_serial *serial)
 {
         return serial->private;
 }
 
-static inline void usb_set_serial_data (struct usb_serial *serial, void *data)
+static inline void usb_set_serial_data(struct usb_serial *serial, void *data)
 {
         serial->private = data;
 }
 
 /**
  * usb_serial_driver - describes a usb serial driver
- * @description: pointer to a string that describes this driver.  This string used
- *      in the syslog messages when a device is inserted or removed.
+ * @description: pointer to a string that describes this driver.  This string
+ *      used in the syslog messages when a device is inserted or removed.
  * @id_table: pointer to a list of usb_device_id structures that define all
  *      of the devices this structure can support.
  * @num_interrupt_in: If a device doesn't have this many interrupt-in
@@ -218,82 +223,91 @@ struct usb_serial_driver {
         struct usb_driver       *usb_driver;
         struct usb_dynids       dynids;
 
-        int (*probe) (struct usb_serial *serial, const struct usb_device_id *id);
-        int (*attach) (struct usb_serial *serial);
+        int (*probe)(struct usb_serial *serial, const struct usb_device_id *id);
+        int (*attach)(struct usb_serial *serial);
         int (*calc_num_ports) (struct usb_serial *serial);
 
-        void (*shutdown) (struct usb_serial *serial);
+        void (*shutdown)(struct usb_serial *serial);
 
-        int (*port_probe) (struct usb_serial_port *port);
-        int (*port_remove) (struct usb_serial_port *port);
+        int (*port_probe)(struct usb_serial_port *port);
+        int (*port_remove)(struct usb_serial_port *port);
 
-        int (*suspend) (struct usb_serial *serial, pm_message_t message);
-        int (*resume) (struct usb_serial *serial);
+        int (*suspend)(struct usb_serial *serial, pm_message_t message);
+        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, 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, unsigned int set, unsigned int clear);
+        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,
+                      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,
+                         unsigned int set, unsigned int clear);
 
         void (*read_int_callback)(struct urb *urb);
         void (*write_int_callback)(struct urb *urb);
         void (*read_bulk_callback)(struct urb *urb);
         void (*write_bulk_callback)(struct urb *urb);
 };
-#define to_usb_serial_driver(d) container_of(d, struct usb_serial_driver, driver)
+#define to_usb_serial_driver(d) \
+        container_of(d, struct usb_serial_driver, driver)
 
 extern int  usb_serial_register(struct usb_serial_driver *driver);
 extern void usb_serial_deregister(struct usb_serial_driver *driver);
 extern void usb_serial_port_softint(struct usb_serial_port *port);
 
-extern int usb_serial_probe(struct usb_interface *iface, const struct usb_device_id *id);
+extern int usb_serial_probe(struct usb_interface *iface,
+                            const struct usb_device_id *id);
 extern void usb_serial_disconnect(struct usb_interface *iface);
 
 extern int usb_serial_suspend(struct usb_interface *intf, pm_message_t message);
 extern int usb_serial_resume(struct usb_interface *intf);
 
-extern int ezusb_writememory (struct usb_serial *serial, int address, unsigned char *data, int length, __u8 bRequest);
-extern int ezusb_set_reset (struct usb_serial *serial, unsigned char reset_bit);
+extern int ezusb_writememory(struct usb_serial *serial, int address,
+                             unsigned char *data, int length, __u8 bRequest);
+extern int ezusb_set_reset(struct usb_serial *serial, unsigned char reset_bit);
 
 /* USB Serial console functions */
 #ifdef CONFIG_USB_SERIAL_CONSOLE
-extern void usb_serial_console_init (int debug, int minor);
-extern void usb_serial_console_exit (void);
+extern void usb_serial_console_init(int debug, int minor);
+extern void usb_serial_console_exit(void);
 extern void usb_serial_console_disconnect(struct usb_serial *serial);
 #else
-static inline void usb_serial_console_init (int debug, int minor) { }
-static inline void usb_serial_console_exit (void) { }
+static inline void usb_serial_console_init(int debug, int minor) { }
+static inline void usb_serial_console_exit(void) { }
 static inline void usb_serial_console_disconnect(struct usb_serial *serial) {}
 #endif
 
 /* Functions needed by other parts of the usbserial core */
-extern struct usb_serial *usb_serial_get_by_index (unsigned int minor);
+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_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 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_shutdown (struct usb_serial *serial);
-extern int usb_serial_generic_register (int debug);
-extern void usb_serial_generic_deregister (void);
-
-extern int usb_serial_bus_register (struct usb_serial_driver *device);
-extern void usb_serial_bus_deregister (struct usb_serial_driver *device);
+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_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 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_shutdown(struct usb_serial *serial);
+extern int usb_serial_generic_register(int debug);
+extern void usb_serial_generic_deregister(void);
+
+extern int usb_serial_bus_register(struct usb_serial_driver *device);
+extern void usb_serial_bus_deregister(struct usb_serial_driver *device);
 
 extern struct usb_serial_driver usb_serial_generic_device;
 extern struct bus_type usb_serial_bus_type;
@@ -307,16 +321,22 @@ static inline void usb_serial_debug_data(int debug,
         int i;
 
         if (debug) {
-                dev_printk(KERN_DEBUG, dev, "%s - length = %d, data = ", function, size);
+                dev_printk(KERN_DEBUG, dev, "%s - length = %d, data = ",
+                           function, size);
                 for (i = 0; i < size; ++i)
-                        printk ("%.2x ", data[i]);
-                printk ("\n");
+                        printk("%.2x ", data[i]);
+                printk("\n");
         }
 }
 
 /* Use our own dbg macro */
 #undef dbg
-#define dbg(format, arg...) do { if (debug) printk(KERN_DEBUG "%s: " format "\n" , __FILE__ , ## arg); } while (0)
+#define dbg(format, arg...) \
+        do { \
+                if (debug) \
+                        printk(KERN_DEBUG "%s: " format "\n" , __FILE__ , \
+                                ## arg); \
+        } while (0)