Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

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

diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 70f93b18292f7ce26c3a12ee7eb2c0c0d61e3d7b..2d588fb82573f998aa6b899dae13a84fceff4e1b 100644 (file)
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -269,18 +269,8 @@ static void mos7720_bulk_out_data_callback(struct urb *urb)
 
        tty = mos7720_port->port->tty;
 
-       if (tty && mos7720_port->open) {
-               /* let the tty driver wakeup if it has a special *
-                * write_wakeup function */
-               if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
-                    tty->ldisc.write_wakeup)
-                       (tty->ldisc.write_wakeup)(tty);
-
-               /* tell the tty driver that something has changed */
-               wake_up_interruptible(&tty->write_wait);
-       }
-
-       /* schedule_work(&mos7720_port->port->work); */
+       if (tty && mos7720_port->open)
+               tty_wakeup(tty);
 }
 
 /*
@@ -1014,7 +1004,7 @@ static int send_cmd_write_baud_rate(struct moschip_port *mos7720_port,
  *      the specified new settings.
  */
 static void change_port_settings(struct moschip_port *mos7720_port,
-                                struct termios *old_termios)
+                                struct ktermios *old_termios)
 {
        struct usb_serial_port *port;
        struct usb_serial *serial;
@@ -1203,7 +1193,7 @@ static void change_port_settings(struct moschip_port *mos7720_port,
  *     termios structure.
  */
 static void mos7720_set_termios(struct usb_serial_port *port,
-                               struct termios *old_termios)
+                               struct ktermios *old_termios)
 {
        int status;
        unsigned int cflag;
@@ -1605,12 +1595,21 @@ static void mos7720_shutdown(struct usb_serial *serial)
        usb_set_serial_data(serial, NULL);
 }
 
+static struct usb_driver usb_driver = {
+       .name =         "moschip7720",
+       .probe =        usb_serial_probe,
+       .disconnect =   usb_serial_disconnect,
+       .id_table =     moschip_port_id_table,
+       .no_dynamic_id =        1,
+};
+
 static struct usb_serial_driver moschip7720_2port_driver = {
        .driver = {
                .owner =        THIS_MODULE,
                .name =         "moschip7720",
        },
        .description            = "Moschip 2 port adapter",
+       .usb_driver             = &usb_driver,
        .id_table               = moschip_port_id_table,
        .num_interrupt_in       = 1,
        .num_bulk_in            = 2,
@@ -1631,13 +1630,6 @@ static struct usb_serial_driver moschip7720_2port_driver = {
        .read_bulk_callback     = mos7720_bulk_in_callback,
 };
 
-static struct usb_driver usb_driver = {
-       .name =         "moschip7720",
-       .probe =        usb_serial_probe,
-       .disconnect =   usb_serial_disconnect,
-       .id_table =     moschip_port_id_table,
-};
-
 static int __init moschip7720_init(void)
 {
        int retval;