ARM: OMAP: Workqueue changes for tahvo-usb

ARM: OMAP: Workqueue changes for tahvo-usb.c

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/cbus/tahvo-usb.c b/drivers/cbus/tahvo-usb.c
index 829ab0a0ea2c3bb66f8f3a43926b22a17a31c6e8..45b432836ae795a2d497ca1b08bcf27d72e84080 100644 (file)
--- a/drivers/cbus/tahvo-usb.c
+++ b/drivers/cbus/tahvo-usb.c
@@ -535,9 +535,9 @@ static int tahvo_usb_set_peripheral(struct otg_transceiver *otg, struct usb_gadg
        return 0;
 }
 
-static void tahvo_usb_irq_work(void *data)
+static void tahvo_usb_irq_work(struct work_struct *work)
 {
-       struct tahvo_usb *tu = (struct tahvo_usb *)data;
+       struct tahvo_usb *tu = container_of(work, struct tahvo_usb, irq_work);
 
        mutex_lock(&tu->serialize);
        check_vbus_state(tu);
@@ -631,7 +631,7 @@ static int tahvo_usb_probe(struct device *dev)
 #endif
 #endif
 
-       INIT_WORK(&tu->irq_work, tahvo_usb_irq_work, tu);
+       INIT_WORK(&tu->irq_work, tahvo_usb_irq_work);
        mutex_init(&tu->serialize);
 
        /* Set initial state, so that we generate kevents only on