summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Balbi2013-01-24 15:56:35 +0100
committerFelipe Balbi2013-03-18 10:16:50 +0100
commit5a8a375714d007f556c81b739aa69e3c745d8015 (patch)
tree69e629508a258e8393ff6cbb2c672bed439d033b
parentusb: gadget: net2280: let udc-core manage gadget->dev (diff)
downloadkernel-qcow2-linux-5a8a375714d007f556c81b739aa69e3c745d8015.tar.gz
kernel-qcow2-linux-5a8a375714d007f556c81b739aa69e3c745d8015.tar.xz
kernel-qcow2-linux-5a8a375714d007f556c81b739aa69e3c745d8015.zip
usb: gadget: pch_udc: let udc-core manage gadget->dev
By simply setting a flag, we can drop some boilerplate code. Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/gadget/pch_udc.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c
index a787a8ef672b..703214543dd4 100644
--- a/drivers/usb/gadget/pch_udc.c
+++ b/drivers/usb/gadget/pch_udc.c
@@ -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);