6 files changed, 54 insertions, 36 deletions

diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index 812275509137..2a4ac9bd6a3a 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -92,6 +92,7 @@ struct aircable_private {
         struct circ_buf *rx_buf;        /* read buffer */
         int rx_flags;                   /* for throttilng */
         struct work_struct rx_work;     /* work cue for the receiving line */
+        struct usb_serial_port *port;   /* USB port with which associated */
 };
 
 /* Private methods */
@@ -251,10 +252,11 @@ static void aircable_send(struct usb_serial_port *port)
         schedule_work(&port->work);
 }
 
-static void aircable_read(void *params)
+static void aircable_read(struct work_struct *work)
 {
-        struct usb_serial_port *port = params;
-        struct aircable_private *priv = usb_get_serial_port_data(port);
+        struct aircable_private *priv =
+                container_of(work, struct aircable_private, rx_work);
+        struct usb_serial_port *port = priv->port;
         struct tty_struct *tty;
         unsigned char *data;
         int count;
@@ -348,7 +350,8 @@ static int aircable_attach (struct usb_serial *serial)
         }
 
         priv->rx_flags &= ~(THROTTLED | ACTUALLY_THROTTLED);
-        INIT_WORK(&priv->rx_work, aircable_read, port);
+        priv->port = port;
+        INIT_WORK(&priv->rx_work, aircable_read);
 
         usb_set_serial_port_data(serial->port[0], priv);
 
@@ -515,7 +518,7 @@ static void aircable_read_bulk_callback(struct urb *urb)
                                         package_length - shift);
                         }
                 }
-                aircable_read(port);
+                aircable_read(&priv->rx_work);
         }
 
         /* Schedule the next read _if_ we are still open */
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index bdb58100fc1d..fd159b040bfb 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -430,13 +430,14 @@ struct digi_port {
         int dp_in_close;                        /* close in progress */
         wait_queue_head_t dp_close_wait;        /* wait queue for close */
         struct work_struct dp_wakeup_work;
+        struct usb_serial_port *dp_port;
 };
 
 
 /* Local Function Declarations */
 
 static void digi_wakeup_write( struct usb_serial_port *port );
-static void digi_wakeup_write_lock(void *);
+static void digi_wakeup_write_lock(struct work_struct *work);
 static int digi_write_oob_command( struct usb_serial_port *port,
         unsigned char *buf, int count, int interruptible );
 static int digi_write_inb_command( struct usb_serial_port *port,
@@ -598,11 +599,12 @@ static inline long cond_wait_interruptible_timeout_irqrestore(
 *  on writes.
 */
 
-static void digi_wakeup_write_lock(void *arg)
+static void digi_wakeup_write_lock(struct work_struct *work)
 {
-        struct usb_serial_port *port = arg;
+        struct digi_port *priv =
+                container_of(work, struct digi_port, dp_wakeup_work);
+        struct usb_serial_port *port = priv->dp_port;
         unsigned long flags;
-        struct digi_port *priv = usb_get_serial_port_data(port);
 
 
         spin_lock_irqsave( &priv->dp_port_lock, flags );
@@ -1702,8 +1704,8 @@ dbg( "digi_startup: TOP" );
                 init_waitqueue_head( &priv->dp_flush_wait );
                 priv->dp_in_close = 0;
                 init_waitqueue_head( &priv->dp_close_wait );
-                INIT_WORK(&priv->dp_wakeup_work,
-                                digi_wakeup_write_lock, serial->port[i]);
+                INIT_WORK(&priv->dp_wakeup_work, digi_wakeup_write_lock);
+                priv->dp_port = serial->port[i];
 
                 /* initialize write wait queue for this port */
                 init_waitqueue_head( &serial->port[i]->write_wait );
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index c186b4e73c72..88ed5c1d236c 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -559,7 +559,8 @@ struct ftdi_private {
         char prev_status, diff_status;        /* Used for TIOCMIWAIT */
         __u8 rx_flags;          /* receive state flags (throttling) */
         spinlock_t rx_lock;     /* spinlock for receive state */
-        struct work_struct rx_work;
+        struct delayed_work rx_work;
+        struct usb_serial_port *port;
         int rx_processed;
         unsigned long rx_bytes;
 
@@ -593,7 +594,7 @@ static int  ftdi_write_room		(struct usb_serial_port *port);
 static int  ftdi_chars_in_buffer        (struct usb_serial_port *port);
 static void ftdi_write_bulk_callback    (struct urb *urb);
 static void ftdi_read_bulk_callback     (struct urb *urb);
-static void ftdi_process_read           (void *param);
+static void ftdi_process_read           (struct work_struct *work);
 static void ftdi_set_termios            (struct usb_serial_port *port, struct termios * old);
 static int  ftdi_tiocmget               (struct usb_serial_port *port, struct file *file);
 static int  ftdi_tiocmset               (struct usb_serial_port *port, struct file * file, unsigned int set, unsigned int clear);
@@ -1201,7 +1202,8 @@ static int ftdi_sio_attach (struct usb_serial *serial)
                 port->read_urb->transfer_buffer_length = BUFSZ;
         }
 
-        INIT_WORK(&priv->rx_work, ftdi_process_read, port);
+        INIT_DELAYED_WORK(&priv->rx_work, ftdi_process_read);
+        priv->port = port;
 
         /* Free port's existing write urb and transfer buffer. */
         if (port->write_urb) {
@@ -1641,17 +1643,18 @@ static void ftdi_read_bulk_callback (struct urb *urb)
         priv->rx_bytes += countread;
         spin_unlock_irqrestore(&priv->rx_lock, flags);
 
-        ftdi_process_read(port);
+        ftdi_process_read(&priv->rx_work.work);
 
 } /* ftdi_read_bulk_callback */
 
 
-static void ftdi_process_read (void *param)
+static void ftdi_process_read (struct work_struct *work)
 { /* ftdi_process_read */
-        struct usb_serial_port *port = (struct usb_serial_port*)param;
+        struct ftdi_private *priv =
+                container_of(work, struct ftdi_private, rx_work.work);
+        struct usb_serial_port *port = priv->port;
         struct urb *urb;
         struct tty_struct *tty;
-        struct ftdi_private *priv;
         char error_flag;
         unsigned char *data;
 
@@ -2180,7 +2183,7 @@ static void ftdi_unthrottle (struct usb_serial_port *port)
         spin_unlock_irqrestore(&priv->rx_lock, flags);
 
         if (actually_throttled)
-                schedule_work(&priv->rx_work);
+                schedule_delayed_work(&priv->rx_work, 0);
 }
 
 static int __init ftdi_init (void)
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 909005107ea2..e09a0bfe6231 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -120,6 +120,8 @@ struct keyspan_pda_private {
         int                     tx_throttled;
         struct work_struct                      wakeup_work;
         struct work_struct                      unthrottle_work;
+        struct usb_serial       *serial;
+        struct usb_serial_port  *port;
 };
 
 
@@ -175,9 +177,11 @@ static struct usb_device_id id_table_fake_xircom [] = {
 };
 #endif
 
-static void keyspan_pda_wakeup_write( struct usb_serial_port *port )
+static void keyspan_pda_wakeup_write(struct work_struct *work)
 {
-
+        struct keyspan_pda_private *priv =
+                container_of(work, struct keyspan_pda_private, wakeup_work);
+        struct usb_serial_port *port = priv->port;
         struct tty_struct *tty = port->tty;
 
         /* wake up port processes */
@@ -187,8 +191,11 @@ static void keyspan_pda_wakeup_write( struct usb_serial_port *port )
         tty_wakeup(tty);
 }
 
-static void keyspan_pda_request_unthrottle( struct usb_serial *serial )
+static void keyspan_pda_request_unthrottle(struct work_struct *work)
 {
+        struct keyspan_pda_private *priv =
+                container_of(work, struct keyspan_pda_private, unthrottle_work);
+        struct usb_serial *serial = priv->serial;
         int result;
 
         dbg(" request_unthrottle");
@@ -765,11 +772,10 @@ static int keyspan_pda_startup (struct usb_serial *serial)
                 return (1); /* error */
         usb_set_serial_port_data(serial->port[0], priv);
         init_waitqueue_head(&serial->port[0]->write_wait);
-        INIT_WORK(&priv->wakeup_work, (void *)keyspan_pda_wakeup_write,
-                        (void *)(serial->port[0]));
-        INIT_WORK(&priv->unthrottle_work,
-                        (void *)keyspan_pda_request_unthrottle,
-                        (void *)(serial));
+        INIT_WORK(&priv->wakeup_work, keyspan_pda_wakeup_write);
+        INIT_WORK(&priv->unthrottle_work, keyspan_pda_request_unthrottle);
+        priv->serial = serial;
+        priv->port = serial->port[0];
         return (0);
 }
 
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 8006e51c34bb..2cfba8488a93 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -533,9 +533,10 @@ void usb_serial_port_softint(struct usb_serial_port *port)
         schedule_work(&port->work);
 }
 
-static void usb_serial_port_work(void *private)
+static void usb_serial_port_work(struct work_struct *work)
 {
-        struct usb_serial_port *port = private;
+        struct usb_serial_port *port =
+                container_of(work, struct usb_serial_port, work);
         struct tty_struct *tty;
 
         dbg("%s - port %d", __FUNCTION__, port->number);
@@ -799,7 +800,7 @@ int usb_serial_probe(struct usb_interface *interface,
                 port->serial = serial;
                 spin_lock_init(&port->lock);
                 mutex_init(&port->mutex);
-                INIT_WORK(&port->work, usb_serial_port_work, port);
+                INIT_WORK(&port->work, usb_serial_port_work);
                 serial->port[i] = port;
         }
 
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 4d1cd7aeccd3..154c7d290597 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -227,6 +227,7 @@ struct whiteheat_private {
         struct list_head        rx_urbs_submitted;
         struct list_head        rx_urb_q;
         struct work_struct      rx_work;
+        struct usb_serial_port  *port;
         struct list_head        tx_urbs_free;
         struct list_head        tx_urbs_submitted;
 };
@@ -241,7 +242,7 @@ static void command_port_read_callback(struct urb *urb);
 static int start_port_read(struct usb_serial_port *port);
 static struct whiteheat_urb_wrap *urb_to_wrap(struct urb *urb, struct list_head *head);
 static struct list_head *list_first(struct list_head *head);
-static void rx_data_softint(void *private);
+static void rx_data_softint(struct work_struct *work);
 
 static int firm_send_command(struct usb_serial_port *port, __u8 command, __u8 *data, __u8 datasize);
 static int firm_open(struct usb_serial_port *port);
@@ -424,7 +425,8 @@ static int whiteheat_attach (struct usb_serial *serial)
                 spin_lock_init(&info->lock);
                 info->flags = 0;
                 info->mcr = 0;
-                INIT_WORK(&info->rx_work, rx_data_softint, port);
+                INIT_WORK(&info->rx_work, rx_data_softint);
+                info->port = port;
 
                 INIT_LIST_HEAD(&info->rx_urbs_free);
                 INIT_LIST_HEAD(&info->rx_urbs_submitted);
@@ -949,7 +951,7 @@ static void whiteheat_unthrottle (struct usb_serial_port *port)
         spin_unlock_irqrestore(&info->lock, flags);
 
         if (actually_throttled)
-                rx_data_softint(port);
+                rx_data_softint(&info->rx_work);
 
         return;
 }
@@ -1400,10 +1402,11 @@ static struct list_head *list_first(struct list_head *head)
 }
 
 
-static void rx_data_softint(void *private)
+static void rx_data_softint(struct work_struct *work)
 {
-        struct usb_serial_port *port = (struct usb_serial_port *)private;
-        struct whiteheat_private *info = usb_get_serial_port_data(port);
+        struct whiteheat_private *info =
+                container_of(work, struct whiteheat_private, rx_work);
+        struct usb_serial_port *port = info->port;
         struct tty_struct *tty = port->tty;
         struct whiteheat_urb_wrap *wrap;
         struct urb *urb;