AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

usb: musb: da8xx: Use devm in probe

Browse Source 
Simplify things a bit by using devm functions where possible.

Signed-off-by: David Lechner <david@lechnology.com>
[b-liu@ti.com: fixed merge conflict]
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Lechner 2016-09-12 21:48:33 -05:00 committed by Greg Kroah-Hartman
parent 7cba17ec9a
commit d458fe9a71
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/usb/musb/da8xx.c
View File

@ -490,18 +490,16 @@ static int da8xx_probe(struct platform_device *pdev)
struct da8xx_glue *glue; struct da8xx_glue *glue;
struct platform_device_info pinfo; struct platform_device_info pinfo;
struct clk *clk; struct clk *clk;
int ret;
int ret = -ENOMEM; glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);
glue = kzalloc(sizeof(*glue), GFP_KERNEL);
if (!glue) if (!glue)
goto err0; return -ENOMEM;
clk = clk_get(&pdev->dev, "usb20"); clk = devm_clk_get(&pdev->dev, "usb20");
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
dev_err(&pdev->dev, "failed to get clock\n"); dev_err(&pdev->dev, "failed to get clock\n");
ret = PTR_ERR(clk); return PTR_ERR(clk);
goto err3;
} }
ret = clk_enable(clk); ret = clk_enable(clk);
@ -558,12 +556,7 @@ static int da8xx_probe(struct platform_device *pdev)
clk_disable(clk); clk_disable(clk);
err4: err4:
clk_put(clk);
err3:
kfree(glue);
err0:
return ret; return ret;
} }
@ -574,8 +567,6 @@ static int da8xx_remove(struct platform_device *pdev)
platform_device_unregister(glue->musb); platform_device_unregister(glue->musb);
usb_phy_generic_unregister(glue->phy); usb_phy_generic_unregister(glue->phy);
clk_disable(glue->clk); clk_disable(glue->clk);
clk_put(glue->clk);
kfree(glue);
return 0; return 0;
} }