Skip to content

Commit

Permalink
usb: gadget: atmel_usba_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 2533bee commit 621c723
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions drivers/usb/gadget/atmel_usba_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1900,9 +1900,9 @@ static int __init usba_udc_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "FIFO at 0x%08lx mapped at %p\n",
(unsigned long)fifo->start, udc->fifo);

device_initialize(&udc->gadget.dev);
udc->gadget.dev.parent = &pdev->dev;
udc->gadget.dev.dma_mask = pdev->dev.dma_mask;
udc->gadget.register_my_device = true;

platform_set_drvdata(pdev, udc);

Expand Down Expand Up @@ -1962,12 +1962,6 @@ static int __init usba_udc_probe(struct platform_device *pdev)
}
udc->irq = irq;

ret = device_add(&udc->gadget.dev);
if (ret) {
dev_dbg(&pdev->dev, "Could not add gadget: %d\n", ret);
goto err_device_add;
}

if (gpio_is_valid(pdata->vbus_pin)) {
if (!gpio_request(pdata->vbus_pin, "atmel_usba_udc")) {
udc->vbus_pin = pdata->vbus_pin;
Expand Down Expand Up @@ -2007,9 +2001,6 @@ static int __init usba_udc_probe(struct platform_device *pdev)
gpio_free(udc->vbus_pin);
}

device_unregister(&udc->gadget.dev);

err_device_add:
free_irq(irq, udc);
err_request_irq:
kfree(usba_ep);
Expand Down Expand Up @@ -2053,8 +2044,6 @@ static int __exit usba_udc_remove(struct platform_device *pdev)
clk_put(udc->hclk);
clk_put(udc->pclk);

device_unregister(&udc->gadget.dev);

return 0;
}

Expand Down

0 comments on commit 621c723

Please sign in to comment.