Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / drivers / usb / gadget / goku_udc.c

diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 57a547049df57a828f838892a003bf36577ceb4c..480eeb7cfd92d9a9010c804ca932da44dc17ec20 100644 (file)
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -52,8 +52,6 @@
 #define        DRIVER_DESC             "TC86C001 USB Device Controller"
 #define        DRIVER_VERSION          "30-Oct 2003"
 
-#define        DMA_ADDR_INVALID        (~(dma_addr_t)0)
-
 static const char driver_name [] = "goku_udc";
 static const char driver_desc [] = DRIVER_DESC;
 
@@ -276,7 +274,6 @@ goku_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags)
        if (!req)
                return NULL;
 
-       req->req.dma = DMA_ADDR_INVALID;
        INIT_LIST_HEAD(&req->queue);
        return &req->req;
 }
@@ -1343,7 +1340,6 @@ static int goku_udc_start(struct usb_gadget *g,
        /* hook up the driver */
        driver->driver.bus = NULL;
        dev->driver = driver;
-       dev->gadget.dev.driver = &driver->driver;
 
        /*
         * then enable host detection and ep0; and we're ready
@@ -1383,7 +1379,6 @@ static int goku_udc_stop(struct usb_gadget *g,
        dev->driver = NULL;
        stop_activity(dev, driver);
        spin_unlock_irqrestore(&dev->lock, flags);
-       dev->gadget.dev.driver = NULL;
 
        return 0;
 }
@@ -1705,8 +1700,6 @@ static void goku_remove(struct pci_dev *pdev)
                                pci_resource_len (pdev, 0));
        if (dev->enabled)
                pci_disable_device(pdev);
-       if (dev->registered)
-               device_unregister(&dev->gadget.dev);
 
        pci_set_drvdata(pdev, NULL);
        dev->regs = NULL;
@@ -1745,10 +1738,6 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        dev->gadget.max_speed = USB_SPEED_FULL;
 
        /* the "gadget" abstracts/virtualizes the controller */
-       dev_set_name(&dev->gadget.dev, "gadget");
-       dev->gadget.dev.parent = &pdev->dev;
-       dev->gadget.dev.dma_mask = pdev->dev.dma_mask;
-       dev->gadget.dev.release = gadget_release;
        dev->gadget.name = driver_name;
 
        /* now all the pci goodies ... */
@@ -1799,13 +1788,8 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        proc_create_data(proc_node_name, 0, NULL, &udc_proc_fops, dev);
 #endif
 
-       retval = device_register(&dev->gadget.dev);
-       if (retval) {
-               put_device(&dev->gadget.dev);
-               goto err;
-       }
-       dev->registered = 1;
-       retval = usb_add_gadget_udc(&pdev->dev, &dev->gadget);
+       retval = usb_add_gadget_udc_release(&pdev->dev, &dev->gadget,
+                       gadget_release);
        if (retval)
                goto err;