WorkStruct: make allyesconfig

Fix up for make allyesconfig.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 9 insertions, 6 deletions

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;