Merge ../linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / cbus / tahvo-usb.c

diff --git a/drivers/cbus/tahvo-usb.c b/drivers/cbus/tahvo-usb.c
index 829ab0a0ea2c3bb66f8f3a43926b22a17a31c6e8..cfab6c5c3a4ad147c516e2efa4a0ff69346e5be9 100644 (file)
--- a/drivers/cbus/tahvo-usb.c
+++ b/drivers/cbus/tahvo-usb.c
@@ -33,7 +33,7 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <linux/usb_ch9.h>
+#include <linux/usb/ch9.h>
 #include <linux/usb_gadget.h>
 #include <linux/usb.h>
 #include <linux/usb/otg.h>
@@ -105,7 +105,7 @@ static struct platform_device tahvo_usb_device;
  * OTG related functions
  *
  * These shoud be separated into omap-otg.c driver module, as they are used
- * by various transceivers. These functions are needed in the UDC-only case 
+ * by various transceivers. These functions are needed in the UDC-only case
  * as well. These functions are copied from GPL isp1301_omap.c
  * ---------------------------------------------------------------------------
  */
@@ -188,7 +188,7 @@ static int omap_otg_probe(struct device *dev)
        }
 
        return request_irq(tahvo_otg_dev->resource[1].start,
-                          omap_otg_irq, SA_INTERRUPT, DRIVER_NAME,
+                          omap_otg_irq, IRQF_DISABLED, DRIVER_NAME,
                           &tahvo_usb_device);
 }
 
@@ -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