Skip to content

L
linux
Commit 3517c31a authored by Chao Xie's avatar Chao Xie Committed by Felipe Balbi
Browse files
Options

usb: gadget: mv_udc: use devm_xxx for probe 

use devm_xxx for udc driver probe. So we do need care about
the resources release in driver remove or failure handling
in driver probe.
Signed-off-by: default avatarChao Xie <chao.xie@marvell.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 2d7ebbb0
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 100 deletions
drivers/usb/gadget/mv_udc_core.c
View file @ 3517c31a
...@@ -2115,12 +2115,11 @@ static void gadget_release(struct device *_dev) ...@@ -2115,12 +2115,11 @@ static void gadget_release(struct device *_dev)
complete(udc->done); complete(udc->done);
} }
static int mv_udc_remove(struct platform_device *dev) static int mv_udc_remove(struct platform_device *pdev)
{ {
struct mv_udc *udc; struct mv_udc *udc;
int clk_i;
udc = platform_get_drvdata(dev); udc = platform_get_drvdata(pdev);
usb_del_gadget_udc(&udc->gadget); usb_del_gadget_udc(&udc->gadget);
...@@ -2129,55 +2128,27 @@ static int mv_udc_remove(struct platform_device *dev) ...@@ -2129,55 +2128,27 @@ static int mv_udc_remove(struct platform_device *dev)
destroy_workqueue(udc->qwork); destroy_workqueue(udc->qwork);
} }
/*
* If we have transceiver inited,
* then vbus irq will not be requested in udc driver.
*/
if (udc->pdata && udc->pdata->vbus
&& udc->clock_gating && IS_ERR_OR_NULL(udc->transceiver))
free_irq(udc->pdata->vbus->irq, &dev->dev);
/* free memory allocated in probe */ /* free memory allocated in probe */
if (udc->dtd_pool) if (udc->dtd_pool)
dma_pool_destroy(udc->dtd_pool); dma_pool_destroy(udc->dtd_pool);
if (udc->ep_dqh) if (udc->ep_dqh)
dma_free_coherent(&dev->dev, udc->ep_dqh_size, dma_free_coherent(&pdev->dev, udc->ep_dqh_size,
udc->ep_dqh, udc->ep_dqh_dma); udc->ep_dqh, udc->ep_dqh_dma);
kfree(udc->eps);
if (udc->irq)
free_irq(udc->irq, &dev->dev);
mv_udc_disable(udc); mv_udc_disable(udc);
if (udc->cap_regs)
iounmap(udc->cap_regs);
if (udc->phy_regs)
iounmap(udc->phy_regs);
if (udc->status_req) {
kfree(udc->status_req->req.buf);
kfree(udc->status_req);
}
for (clk_i = 0; clk_i <= udc->clknum; clk_i++)
clk_put(udc->clk[clk_i]);
device_unregister(&udc->gadget.dev); device_unregister(&udc->gadget.dev);
/* free dev, wait for the release() finished */ /* free dev, wait for the release() finished */
wait_for_completion(udc->done); wait_for_completion(udc->done);
kfree(udc);
return 0; return 0;
} }
static int mv_udc_probe(struct platform_device *dev) static int mv_udc_probe(struct platform_device *pdev)
{ {
struct mv_usb_platform_data *pdata = dev->dev.platform_data; struct mv_usb_platform_data *pdata = pdev->dev.platform_data;
struct mv_udc *udc; struct mv_udc *udc;
int retval = 0; int retval = 0;
int clk_i = 0; int clk_i = 0;
...@@ -2185,70 +2156,68 @@ static int mv_udc_probe(struct platform_device *dev) ...@@ -2185,70 +2156,68 @@ static int mv_udc_probe(struct platform_device *dev)
size_t size; size_t size;
if (pdata == NULL) { if (pdata == NULL) {
dev_err(&dev->dev, "missing platform_data\n"); dev_err(&pdev->dev, "missing platform_data\n");
return -ENODEV; return -ENODEV;
} }
size = sizeof(*udc) + sizeof(struct clk *) * pdata->clknum; size = sizeof(*udc) + sizeof(struct clk *) * pdata->clknum;
udc = kzalloc(size, GFP_KERNEL); udc = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
if (udc == NULL) { if (udc == NULL) {
dev_err(&dev->dev, "failed to allocate memory for udc\n"); dev_err(&pdev->dev, "failed to allocate memory for udc\n");
return -ENOMEM; return -ENOMEM;
} }
udc->done = &release_done; udc->done = &release_done;
udc->pdata = dev->dev.platform_data; udc->pdata = pdev->dev.platform_data;
spin_lock_init(&udc->lock); spin_lock_init(&udc->lock);
udc->dev = dev; udc->dev = pdev;
#ifdef CONFIG_USB_OTG_UTILS #ifdef CONFIG_USB_OTG_UTILS
if (pdata->mode == MV_USB_MODE_OTG) if (pdata->mode == MV_USB_MODE_OTG)
udc->transceiver = usb_get_phy(USB_PHY_TYPE_USB2); udc->transceiver = devm_usb_get_phy(&pdev->dev,
USB_PHY_TYPE_USB2);
#endif #endif
udc->clknum = pdata->clknum; udc->clknum = pdata->clknum;
for (clk_i = 0; clk_i < udc->clknum; clk_i++) { for (clk_i = 0; clk_i < udc->clknum; clk_i++) {
udc->clk[clk_i] = clk_get(&dev->dev, pdata->clkname[clk_i]); udc->clk[clk_i] = devm_clk_get(&pdev->dev,
pdata->clkname[clk_i]);
if (IS_ERR(udc->clk[clk_i])) { if (IS_ERR(udc->clk[clk_i])) {
retval = PTR_ERR(udc->clk[clk_i]); retval = PTR_ERR(udc->clk[clk_i]);
goto err_put_clk; return retval;
} }
} }
r = platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "capregs"); r = platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "capregs");
if (r == NULL) { if (r == NULL) {
dev_err(&dev->dev, "no I/O memory resource defined\n"); dev_err(&pdev->dev, "no I/O memory resource defined\n");
retval = -ENODEV; return -ENODEV;
goto err_put_clk;
} }
udc->cap_regs = (struct mv_cap_regs __iomem *) udc->cap_regs = (struct mv_cap_regs __iomem *)
ioremap(r->start, resource_size(r)); devm_ioremap(&pdev->dev, r->start, resource_size(r));
if (udc->cap_regs == NULL) { if (udc->cap_regs == NULL) {
dev_err(&dev->dev, "failed to map I/O memory\n"); dev_err(&pdev->dev, "failed to map I/O memory\n");
retval = -EBUSY; return -EBUSY;
goto err_put_clk;
} }
r = platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "phyregs"); r = platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "phyregs");
if (r == NULL) { if (r == NULL) {
dev_err(&dev->dev, "no phy I/O memory resource defined\n"); dev_err(&pdev->dev, "no phy I/O memory resource defined\n");
retval = -ENODEV; return -ENODEV;
goto err_iounmap_capreg;
} }
udc->phy_regs = ioremap(r->start, resource_size(r)); udc->phy_regs = ioremap(r->start, resource_size(r));
if (udc->phy_regs == NULL) { if (udc->phy_regs == NULL) {
dev_err(&dev->dev, "failed to map phy I/O memory\n"); dev_err(&pdev->dev, "failed to map phy I/O memory\n");
retval = -EBUSY; return -EBUSY;
goto err_iounmap_capreg;
} }
/* we will acces controller register, so enable the clk */ /* we will acces controller register, so enable the clk */
retval = mv_udc_enable_internal(udc); retval = mv_udc_enable_internal(udc);
if (retval) if (retval)
goto err_iounmap_phyreg; return retval;
udc->op_regs = udc->op_regs =
(struct mv_op_regs __iomem *)((unsigned long)udc->cap_regs (struct mv_op_regs __iomem *)((unsigned long)udc->cap_regs
...@@ -2265,11 +2234,11 @@ static int mv_udc_probe(struct platform_device *dev) ...@@ -2265,11 +2234,11 @@ static int mv_udc_probe(struct platform_device *dev)
size = udc->max_eps * sizeof(struct mv_dqh) *2; size = udc->max_eps * sizeof(struct mv_dqh) *2;
size = (size + DQH_ALIGNMENT - 1) & ~(DQH_ALIGNMENT - 1); size = (size + DQH_ALIGNMENT - 1) & ~(DQH_ALIGNMENT - 1);
udc->ep_dqh = dma_alloc_coherent(&dev->dev, size, udc->ep_dqh = dma_alloc_coherent(&pdev->dev, size,
&udc->ep_dqh_dma, GFP_KERNEL); &udc->ep_dqh_dma, GFP_KERNEL);
if (udc->ep_dqh == NULL) { if (udc->ep_dqh == NULL) {
dev_err(&dev->dev, "allocate dQH memory failed\n"); dev_err(&pdev->dev, "allocate dQH memory failed\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_disable_clock; goto err_disable_clock;
} }
...@@ -2277,7 +2246,7 @@ static int mv_udc_probe(struct platform_device *dev) ...@@ -2277,7 +2246,7 @@ static int mv_udc_probe(struct platform_device *dev)
/* create dTD dma_pool resource */ /* create dTD dma_pool resource */
udc->dtd_pool = dma_pool_create("mv_dtd", udc->dtd_pool = dma_pool_create("mv_dtd",
&dev->dev, &pdev->dev,
sizeof(struct mv_dtd), sizeof(struct mv_dtd),
DTD_ALIGNMENT, DTD_ALIGNMENT,
DMA_BOUNDARY); DMA_BOUNDARY);
...@@ -2288,19 +2257,20 @@ static int mv_udc_probe(struct platform_device *dev) ...@@ -2288,19 +2257,20 @@ static int mv_udc_probe(struct platform_device *dev)
} }
size = udc->max_eps * sizeof(struct mv_ep) *2; size = udc->max_eps * sizeof(struct mv_ep) *2;
udc->eps = kzalloc(size, GFP_KERNEL); udc->eps = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
if (udc->eps == NULL) { if (udc->eps == NULL) {
dev_err(&dev->dev, "allocate ep memory failed\n"); dev_err(&pdev->dev, "allocate ep memory failed\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_destroy_dma; goto err_destroy_dma;
} }
/* initialize ep0 status request structure */ /* initialize ep0 status request structure */
udc->status_req = kzalloc(sizeof(struct mv_req), GFP_KERNEL); udc->status_req = devm_kzalloc(&pdev->dev, sizeof(struct mv_req),
GFP_KERNEL);
if (!udc->status_req) { if (!udc->status_req) {
dev_err(&dev->dev, "allocate status_req memory failed\n"); dev_err(&pdev->dev, "allocate status_req memory failed\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_free_eps; goto err_destroy_dma;
} }
INIT_LIST_HEAD(&udc->status_req->queue); INIT_LIST_HEAD(&udc->status_req->queue);
...@@ -2315,17 +2285,17 @@ static int mv_udc_probe(struct platform_device *dev) ...@@ -2315,17 +2285,17 @@ static int mv_udc_probe(struct platform_device *dev)
r = platform_get_resource(udc->dev, IORESOURCE_IRQ, 0); r = platform_get_resource(udc->dev, IORESOURCE_IRQ, 0);
if (r == NULL) { if (r == NULL) {
dev_err(&dev->dev, "no IRQ resource defined\n"); dev_err(&pdev->dev, "no IRQ resource defined\n");
retval = -ENODEV; retval = -ENODEV;
goto err_free_status_req; goto err_destroy_dma;
} }
udc->irq = r->start; udc->irq = r->start;
if (request_irq(udc->irq, mv_udc_irq, if (devm_request_irq(&pdev->dev, udc->irq, mv_udc_irq,
IRQF_SHARED, driver_name, udc)) { IRQF_SHARED, driver_name, udc)) {
dev_err(&dev->dev, "Request irq %d for UDC failed\n", dev_err(&pdev->dev, "Request irq %d for UDC failed\n",
udc->irq); udc->irq);
retval = -ENODEV; retval = -ENODEV;
goto err_free_status_req; goto err_destroy_dma;
} }
/* initialize gadget structure */ /* initialize gadget structure */
...@@ -2337,14 +2307,14 @@ static int mv_udc_probe(struct platform_device *dev) ...@@ -2337,14 +2307,14 @@ static int mv_udc_probe(struct platform_device *dev)
/* the "gadget" abstracts/virtualizes the controller */ /* the "gadget" abstracts/virtualizes the controller */
dev_set_name(&udc->gadget.dev, "gadget"); dev_set_name(&udc->gadget.dev, "gadget");
udc->gadget.dev.parent = &dev->dev; udc->gadget.dev.parent = &pdev->dev;
udc->gadget.dev.dma_mask = dev->dev.dma_mask; udc->gadget.dev.dma_mask = pdev->dev.dma_mask;
udc->gadget.dev.release = gadget_release; udc->gadget.dev.release = gadget_release;
udc->gadget.name = driver_name; /* gadget name */ udc->gadget.name = driver_name; /* gadget name */
retval = device_register(&udc->gadget.dev); retval = device_register(&udc->gadget.dev);
if (retval) if (retval)
goto err_free_irq; goto err_destroy_dma;
eps_init(udc); eps_init(udc);
...@@ -2353,10 +2323,11 @@ static int mv_udc_probe(struct platform_device *dev) ...@@ -2353,10 +2323,11 @@ static int mv_udc_probe(struct platform_device *dev)
udc->clock_gating = 1; udc->clock_gating = 1;
else if (pdata->vbus) { else if (pdata->vbus) {
udc->clock_gating = 1; udc->clock_gating = 1;
retval = request_threaded_irq(pdata->vbus->irq, NULL, retval = devm_request_threaded_irq(&pdev->dev,
pdata->vbus->irq, NULL,
mv_udc_vbus_irq, IRQF_ONESHOT, "vbus", udc); mv_udc_vbus_irq, IRQF_ONESHOT, "vbus", udc);
if (retval) { if (retval) {
dev_info(&dev->dev, dev_info(&pdev->dev,
"Can not request irq for VBUS, " "Can not request irq for VBUS, "
"disable clock gating\n"); "disable clock gating\n");
udc->clock_gating = 0; udc->clock_gating = 0;
...@@ -2364,7 +2335,7 @@ static int mv_udc_probe(struct platform_device *dev) ...@@ -2364,7 +2335,7 @@ static int mv_udc_probe(struct platform_device *dev)
udc->qwork = create_singlethread_workqueue("mv_udc_queue"); udc->qwork = create_singlethread_workqueue("mv_udc_queue");
if (!udc->qwork) { if (!udc->qwork) {
dev_err(&dev->dev, "cannot create workqueue\n"); dev_err(&pdev->dev, "cannot create workqueue\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_unregister; goto err_unregister;
} }
...@@ -2382,43 +2353,28 @@ static int mv_udc_probe(struct platform_device *dev) ...@@ -2382,43 +2353,28 @@ static int mv_udc_probe(struct platform_device *dev)
else else
udc->vbus_active = 1; udc->vbus_active = 1;
retval = usb_add_gadget_udc(&dev->dev, &udc->gadget); retval = usb_add_gadget_udc(&pdev->dev, &udc->gadget);
if (retval) if (retval)
goto err_unregister; goto err_create_workqueue;
platform_set_drvdata(dev, udc); platform_set_drvdata(pdev, udc);
dev_info(&dev->dev, "successful probe UDC device %s clock gating.\n", dev_info(&pdev->dev, "successful probe UDC device %s clock gating.\n",
udc->clock_gating ? "with" : "without"); udc->clock_gating ? "with" : "without");
return 0; return 0;
err_create_workqueue:
destroy_workqueue(udc->qwork);
err_unregister: err_unregister:
if (udc->pdata && udc->pdata->vbus
&& udc->clock_gating && IS_ERR_OR_NULL(udc->transceiver))
free_irq(pdata->vbus->irq, &dev->dev);
device_unregister(&udc->gadget.dev); device_unregister(&udc->gadget.dev);
err_free_irq:
free_irq(udc->irq, &dev->dev);
err_free_status_req:
kfree(udc->status_req->req.buf);
kfree(udc->status_req);
err_free_eps:
kfree(udc->eps);
err_destroy_dma: err_destroy_dma:
dma_pool_destroy(udc->dtd_pool); dma_pool_destroy(udc->dtd_pool);
err_free_dma: err_free_dma:
dma_free_coherent(&dev->dev, udc->ep_dqh_size, dma_free_coherent(&pdev->dev, udc->ep_dqh_size,
udc->ep_dqh, udc->ep_dqh_dma); udc->ep_dqh, udc->ep_dqh_dma);
err_disable_clock: err_disable_clock:
mv_udc_disable_internal(udc); mv_udc_disable_internal(udc);
err_iounmap_phyreg:
iounmap(udc->phy_regs);
err_iounmap_capreg:
iounmap(udc->cap_regs);
err_put_clk:
for (clk_i--; clk_i >= 0; clk_i--)
clk_put(udc->clk[clk_i]);
kfree(udc);
return retval; return retval;
} }
...@@ -2489,12 +2445,12 @@ static const struct dev_pm_ops mv_udc_pm_ops = { ...@@ -2489,12 +2445,12 @@ static const struct dev_pm_ops mv_udc_pm_ops = {
}; };
#endif #endif
static void mv_udc_shutdown(struct platform_device *dev) static void mv_udc_shutdown(struct platform_device *pdev)
{ {
struct mv_udc *udc; struct mv_udc *udc;
u32 mode; u32 mode;
udc = platform_get_drvdata(dev); udc = platform_get_drvdata(pdev);
/* reset controller mode to IDLE */ /* reset controller mode to IDLE */
mv_udc_enable(udc); mv_udc_enable(udc);
mode = readl(&udc->op_regs->usbmode); mode = readl(&udc->op_regs->usbmode);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7