leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: gadget: at91_udc: let udc-core manage gadget->dev

Browse Source 
By simply setting a flag, we can remove some
boilerplate code.

Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Felipe Balbi 2013-01-24 15:15:30 +02:00
parent 12ad0fcaf2
commit 2533beea90
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usb/gadget/at91_udc.c
View File

@ -1726,6 +1726,7 @@ static int at91udc_probe(struct platform_device *pdev)
/* init software state */ /* init software state */
udc = &controller; udc = &controller;
udc->gadget.register_my_device = true;
udc->gadget.dev.parent = dev; udc->gadget.dev.parent = dev;
if (pdev->dev.of_node) if (pdev->dev.of_node)
at91udc_of_init(udc, pdev->dev.of_node); at91udc_of_init(udc, pdev->dev.of_node);
@ -1780,13 +1781,7 @@ static int at91udc_probe(struct platform_device *pdev)
DBG("clocks missing\n"); DBG("clocks missing\n");
retval = -ENODEV; retval = -ENODEV;
/* NOTE: we "know" here that refcounts on these are NOPs */ /* NOTE: we "know" here that refcounts on these are NOPs */
goto fail0b; goto fail1;
}
retval = device_register(&udc->gadget.dev);
if (retval < 0) {
put_device(&udc->gadget.dev);
goto fail0b;
} }
/* don't do anything until we have both gadget driver and VBUS */ /* don't do anything until we have both gadget driver and VBUS */
@ -1857,8 +1852,6 @@ fail3:
fail2: fail2:
free_irq(udc->udp_irq, udc); free_irq(udc->udp_irq, udc);
fail1: fail1:
device_unregister(&udc->gadget.dev);
fail0b:
iounmap(udc->udp_baseaddr); iounmap(udc->udp_baseaddr);
fail0a: fail0a:
if (cpu_is_at91rm9200()) if (cpu_is_at91rm9200())
@ -1892,8 +1885,6 @@ static int __exit at91udc_remove(struct platform_device *pdev)
gpio_free(udc->board.vbus_pin); gpio_free(udc->board.vbus_pin);
} }
free_irq(udc->udp_irq, udc); free_irq(udc->udp_irq, udc);
device_unregister(&udc->gadget.dev);
iounmap(udc->udp_baseaddr); iounmap(udc->udp_baseaddr);
if (cpu_is_at91rm9200()) if (cpu_is_at91rm9200())