Skip to content

Commit

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

Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Felipe Balbi committed Mar 18, 2013
1 parent 5ed01c6 commit 6dfc84f
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/usb/gadget/omap_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2632,10 +2632,9 @@ omap_udc_setup(struct platform_device *odev, struct usb_phy *xceiv)
udc->gadget.max_speed = USB_SPEED_FULL;
udc->gadget.name = driver_name;

device_initialize(&udc->gadget.dev);
dev_set_name(&udc->gadget.dev, "gadget");
udc->gadget.dev.release = omap_udc_release;
udc->gadget.dev.parent = &odev->dev;
udc->gadget.register_my_device = true;
if (use_dma)
udc->gadget.dev.dma_mask = odev->dev.dma_mask;

Expand Down Expand Up @@ -2912,14 +2911,12 @@ static int omap_udc_probe(struct platform_device *pdev)
}

create_proc_file();
status = device_add(&udc->gadget.dev);
status = usb_add_gadget_udc(&pdev->dev, &udc->gadget);
if (status)
goto cleanup4;

status = usb_add_gadget_udc(&pdev->dev, &udc->gadget);
if (!status)
return status;
/* If fail, fall through */
return 0;

cleanup4:
remove_proc_file();

Expand Down Expand Up @@ -2990,7 +2987,6 @@ static int omap_udc_remove(struct platform_device *pdev)
release_mem_region(pdev->resource[0].start,
pdev->resource[0].end - pdev->resource[0].start + 1);

device_unregister(&udc->gadget.dev);
wait_for_completion(&done);

return 0;
Expand Down

0 comments on commit 6dfc84f

Please sign in to comment.