Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 15:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

usb: gadget: r8a66597-udc: use devm_clk_get() to get clock

Browse Source 
Change to using the devm_clk_get() to get the clock and
have it automatically freed on exit.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Ben Dooks 2014-06-17 16:14:59 +01:00 committed by Felipe Balbi
parent 776976a67a
commit 3d7037b76b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/gadget/r8a66597-udc.c
View File

@ -1831,7 +1831,6 @@ static int __exit r8a66597_remove(struct platform_device *pdev)
if (r8a66597->pdata->on_chip) { if (r8a66597->pdata->on_chip) {
clk_disable_unprepare(r8a66597->clk); clk_disable_unprepare(r8a66597->clk);
clk_put(r8a66597->clk);
} }
return 0; return 0;
@ -1903,11 +1902,10 @@ static int __init r8a66597_probe(struct platform_device *pdev)
if (r8a66597->pdata->on_chip) { if (r8a66597->pdata->on_chip) {
snprintf(clk_name, sizeof(clk_name), "usb%d", pdev->id); snprintf(clk_name, sizeof(clk_name), "usb%d", pdev->id);
r8a66597->clk = clk_get(dev, clk_name); r8a66597->clk = devm_clk_get(dev, clk_name);
if (IS_ERR(r8a66597->clk)) { if (IS_ERR(r8a66597->clk)) {
dev_err(dev, "cannot get clock \"%s\"\n", clk_name); dev_err(dev, "cannot get clock \"%s\"\n", clk_name);
ret = PTR_ERR(r8a66597->clk); return PTR_ERR(r8a66597->clk);
goto clean_up;
} }
clk_prepare_enable(r8a66597->clk); clk_prepare_enable(r8a66597->clk);
} }
@ -1973,10 +1971,8 @@ err_add_udc:
clean_up3: clean_up3:
free_irq(irq, r8a66597); free_irq(irq, r8a66597);
clean_up2: clean_up2:
if (r8a66597->pdata->on_chip) { if (r8a66597->pdata->on_chip)
clk_disable_unprepare(r8a66597->clk); clk_disable_unprepare(r8a66597->clk);
clk_put(r8a66597->clk);
}
clean_up: clean_up:
if (r8a66597->ep0_req) if (r8a66597->ep0_req)
r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req); r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);