Skip to content

Commit

Permalink
usb: gadget: bcm63xx_udc: let udc-core manage gadget->dev
Browse files Browse the repository at this point in the history
By simply setting a flag, we can drop some
boilerplate code.

Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Felipe Balbi committed Mar 18, 2013
1 parent 621c723 commit 9b4ead0
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/usb/gadget/bcm63xx_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2368,13 +2368,13 @@ static int bcm63xx_udc_probe(struct platform_device *pdev)

spin_lock_init(&udc->lock);
INIT_WORK(&udc->ep0_wq, bcm63xx_ep0_process);
dev_set_name(&udc->gadget.dev, "gadget");

udc->gadget.ops = &bcm63xx_udc_ops;
udc->gadget.name = dev_name(dev);
udc->gadget.dev.parent = dev;
udc->gadget.dev.release = bcm63xx_udc_gadget_release;
udc->gadget.dev.dma_mask = dev->dma_mask;
udc->gadget.register_my_device = true;

if (!pd->use_fullspeed && !use_fullspeed)
udc->gadget.max_speed = USB_SPEED_HIGH;
Expand Down Expand Up @@ -2414,17 +2414,12 @@ static int bcm63xx_udc_probe(struct platform_device *pdev)
}
}

rc = device_register(&udc->gadget.dev);
if (rc)
goto out_uninit;

bcm63xx_udc_init_debugfs(udc);
rc = usb_add_gadget_udc(dev, &udc->gadget);
if (!rc)
return 0;

bcm63xx_udc_cleanup_debugfs(udc);
device_unregister(&udc->gadget.dev);
out_uninit:
bcm63xx_uninit_udc_hw(udc);
return rc;
Expand All @@ -2440,7 +2435,6 @@ static int bcm63xx_udc_remove(struct platform_device *pdev)

bcm63xx_udc_cleanup_debugfs(udc);
usb_del_gadget_udc(&udc->gadget);
device_unregister(&udc->gadget.dev);
BUG_ON(udc->driver);

platform_set_drvdata(pdev, NULL);
Expand Down

0 comments on commit 9b4ead0

Please sign in to comment.