]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
usb: gadget: pch_udc: let udc-core manage gadget->dev
authorFelipe Balbi <balbi@ti.com>
Thu, 24 Jan 2013 14:56:35 +0000 (16:56 +0200)
committerFelipe Balbi <balbi@ti.com>
Mon, 18 Mar 2013 09:16:50 +0000 (11:16 +0200)
By simply setting a flag, we can drop some
boilerplate code.

Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/gadget/pch_udc.c

index a787a8ef672b0fc60f0969075dda6eaa3d4f7e0c..703214543dd479172a40c22d5dfa46d48bfe689b 100644 (file)
@@ -358,7 +358,6 @@ struct pch_udc_dev {
                        prot_stall:1,
                        irq_registered:1,
                        mem_region:1,
-                       registered:1,
                        suspended:1,
                        connected:1,
                        vbus_session:1,
@@ -3078,8 +3077,6 @@ static void pch_udc_remove(struct pci_dev *pdev)
                                   pci_resource_len(pdev, PCH_UDC_PCI_BAR));
        if (dev->active)
                pci_disable_device(pdev);
-       if (dev->registered)
-               device_unregister(&dev->gadget.dev);
        kfree(dev);
        pci_set_drvdata(pdev, NULL);
 }
@@ -3196,17 +3193,12 @@ static int pch_udc_probe(struct pci_dev *pdev,
        if (retval)
                goto finished;
 
-       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 = KBUILD_MODNAME;
        dev->gadget.max_speed = USB_SPEED_HIGH;
-
-       retval = device_register(&dev->gadget.dev);
-       if (retval)
-               goto finished;
-       dev->registered = 1;
+       dev->gadget.register_my_device = true;
 
        /* Put the device in disconnected state till a driver is bound */
        pch_udc_set_disconnect(dev);